Changeset 27405

Show
Ignore:
Timestamp:
23.05.2013 13:48:10 (6 years ago)
Author:
jmt12
Message:

Now that I can get the Perl version, make the cascade make script smart enough to look up the appropriate location for conditional installs (don't install if already installed)

Location:
gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/IPCRUN.sh

    r25812 r27405  
    99 
    1010prefix=$GEXTPARALLELBUILDING_INSTALLED 
     11perlversion=$(perl-version.pl) 
    1112 
    1213opt_run_untar $force_untar $auto_untar $package $version 
    13 opt_run_perl_configure $force_config $auto_config $package $version $prefix 
     14opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="$prefix/lib/perl/$perlversion" INSTALLSITELIB="$prefix/lib/perl/$perlversion" 
    1415 
    1516# We only compile if necessary, as compilation is quite slow and we don't 
    1617# edit these source files 
    17 if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/share/perl/5.12.4/IPC/Run.pm" ]] 
     18if [[ ! -e "$prefix/lib/perl/$perlversion/IPC/Run.pm" ]] 
    1819then 
    1920  opt_run_make $compile   $package $version 
  • gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/PROCDAEMON.sh

    r25812 r27405  
    99 
    1010prefix=$GEXTPARALLELBUILDING_INSTALLED 
     11perlversion=$(perl-version.pl) 
    1112 
    1213opt_run_untar $force_untar $auto_untar $package $version 
    13 opt_run_perl_configure $force_config $auto_config $package $version $prefix 
     14opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="$prefix/lib/perl/$perlversion" INSTALLSITELIB="$prefix/lib/perl/$perlversion" 
    1415 
    1516# We only compile if necessary, as compilation is quite slow and we don't 
    1617# edit these source files 
    17 if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/share/perl/5.12.4/Proc/Daemon.pm" ]] 
     18if [[ ! -e "$prefix/lib/perl/$perlversion/Proc/Daemon.pm" ]] 
    1819then 
    1920  opt_run_make $compile   $package $version 
  • gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/SORTKEY.sh

    r27051 r27405  
    1212 
    1313opt_run_untar $force_untar $auto_untar $package $version 
    14 opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="$prefix/lib/perl/$perlversion" 
     14opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="$prefix/lib/perl/$perlversion" INSTALLSITELIB="$prefix/lib/perl/$perlversion" 
    1515 
    1616# We only compile if necessary, as compilation is quite slow and we don't 
    1717# edit these source files 
    18 if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/lib/perl/$perlversion/Sort/Key.pm" ]] 
     18if [[ ! -e "$prefix/lib/perl/$perlversion/Sort/Key.pm" ]] 
    1919then 
    2020  opt_run_make $compile   $package $version