Browse Source

tag perl wrapper with package information to avoid conflicts from parallel builds

Michael van Elst 22 years ago
parent
commit
d6c6989e17
2 changed files with 9 additions and 5 deletions
  1. 7 3
      perl-openpkg/perl-openpkg.sh
  2. 2 2
      perl-openpkg/perl-openpkg.spec

+ 7 - 3
perl-openpkg/perl-openpkg.sh

@@ -35,7 +35,8 @@ case $cmd in
         #   prepare Perl executable wrapper
         #   prepare Perl executable wrapper
         log "prepare Perl executable wrapper"
         log "prepare Perl executable wrapper"
         eval `${l_prefix}/bin/perl -V:installarchlib -V:installprivlib -V:installsitearch -V:installsitelib`
         eval `${l_prefix}/bin/perl -V:installarchlib -V:installprivlib -V:installsitearch -V:installsitelib`
-        perl="${RPM_BUILD_DIR}/perl"
+        tag="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}"
+        perl="${RPM_BUILD_DIR}/perl-$tag"
         echo "#!/bin/sh" >$perl
         echo "#!/bin/sh" >$perl
         echo "exec ${l_prefix}/bin/perl \\" >>$perl
         echo "exec ${l_prefix}/bin/perl \\" >>$perl
         echo " -I${RPM_BUILD_ROOT}${installarchlib}  \\" >>$perl
         echo " -I${RPM_BUILD_ROOT}${installarchlib}  \\" >>$perl
@@ -49,7 +50,8 @@ case $cmd in
     install )
     install )
         #   determine build parameters
         #   determine build parameters
         log "determine build parameters"
         log "determine build parameters"
-        perl="${RPM_BUILD_DIR}/perl"
+        tag="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}"
+        perl="${RPM_BUILD_DIR}/perl-$tag"
         perl_args="PREFIX=${RPM_BUILD_ROOT}${l_prefix} INSTALLDIRS=site"
         perl_args="PREFIX=${RPM_BUILD_ROOT}${l_prefix} INSTALLDIRS=site"
         perl_args="${perl_args} PERL=${perl} FULLPERL=${perl}"
         perl_args="${perl_args} PERL=${perl} FULLPERL=${perl}"
         make=`${l_prefix}/bin/rpm --eval '%{l_make} %{l_mflags}'`
         make=`${l_prefix}/bin/rpm --eval '%{l_make} %{l_mflags}'`
@@ -101,6 +103,8 @@ case $cmd in
 
 
         #   determining installation files
         #   determining installation files
         log "determining installation files"
         log "determining installation files"
+        tag="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}"
+        perl="${RPM_BUILD_DIR}/perl-$tag"
         eval `${l_prefix}/bin/perl -V:installarchlib -V:installprivlib -V:installsitearch -V:installsitelib`
         eval `${l_prefix}/bin/perl -V:installarchlib -V:installprivlib -V:installsitearch -V:installsitelib`
         l_rpmtool=`${l_prefix}/bin/rpm --eval '%{l_rpmtool}'`
         l_rpmtool=`${l_prefix}/bin/rpm --eval '%{l_rpmtool}'`
         eval ${l_rpmtool} files -v -ofiles -r${RPM_BUILD_ROOT} \
         eval ${l_rpmtool} files -v -ofiles -r${RPM_BUILD_ROOT} \
@@ -118,7 +122,7 @@ case $cmd in
             "\"%not ${l_prefix}/man\""
             "\"%not ${l_prefix}/man\""
 
 
         #   cleanup
         #   cleanup
-        rm -f ${RPM_BUILD_DIR}/perl
+        rm -f $perl
         ;;
         ;;
 esac
 esac
 
 

+ 2 - 2
perl-openpkg/perl-openpkg.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Distribution: OpenPKG [BASE]
 Group:        Language
 Group:        Language
 License:      PD
 License:      PD
-Version:      20030123
-Release:      20030123
+Version:      20030514
+Release:      20030514
 
 
 #   list of sources
 #   list of sources
 Source0:      perl-openpkg.sh
 Source0:      perl-openpkg.sh