Changeset 27488

Show
Ignore:
Timestamp:
28.05.2013 09:37:48 (6 years ago)
Author:
jmt12
Message:

Since I've got rid of the thousand DateTime? prereq modules, I can revert to just looking in the CPAN directory (rather than having a hardcoded list ensure precedence)

Files:
1 modified

Legend:

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

    r27467 r27488  
    1111perlinstall="${prefix}/lib/perl/${perlversion}" 
    1212 
    13 filenames="IPC-Run-0.90 Proc-Daemon-0.14 Sort-Key-1.32 Bit-Vector-7.2 version-0.9902 Perl-OSType-1.003 Module-Metadata-1.000014 Module-Build-0.4005 Test-Requires-0.06 Test-Fatal-0.010 Test-Simple-0.98 Module-Runtime-0.013 Try-Tiny-0.12 Module-Implementation-0.06 Params-Validate-1.07 Params-Util-1.07 DateTime-1.03 DateTime-Locale-0.45 List-MoreUtils-0.33.tar.gz Class-Singleton-1.4 Class-Load-0.20 Data-OptList-0.107 parent-0.225 DateTime-TimeZone-1.59" 
     13# You can use a list should you need to force precedence 
     14#filenames="IPC-Run-0.90 Proc-Daemon-0.14 Sort-Key-1.32 Bit-Vector-7.2" 
    1415 
    1516cd cpan 
    1617# 1. Scan <ext>/packages/cpan for *.tar.gz files 
    17 #for filename in *.tar.gz # gah - doesn't support prereqs 
    18 for filename in filenames 
     18for filename in *.tar.gz # gah - doesn't support prereqs 
     19#for filename in $filenames 
    1920do 
    2021  # 2. For each found 
     
    2425  # deal with version first, so we can pop it off array 
    2526  version=${parts[${#parts[@]}-1]} 
    26   # - remove .tar.gz and prepend - 
    27   #version="-${version:0:(${#version} - 7)}" 
    28   # - just prepend - 
     27  # - remove .tar.gz 
     28  version="${version:0:(${#version} - 7)}" 
     29  # - prepend - 
    2930  version="-${version}" 
    3031  # - pop! 
     
    7374    else 
    7475      # d. Configure 
    75       opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="${perlinstall}" INSTALLSITELIB="${perlinstall}" 
     76      opt_run_perl_configure $force_config $auto_config $package $version $prefix INC="${perlinstall}" INSTALLDIRS=site INSTALLSITEARCH="${perlinstall}" INSTALLSITELIB="${perlinstall}" 
    7677      # e. Compile 
    7778      opt_run_make $compile   $package $version