Changeset 27488 for gs2-extensions/parallel-building

Timestamp:

2013-05-28T09:37:48+12:00 (11 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)

File:

• gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/CPAN.sh (modified) (3 diffs)

gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/CPAN.sh

@@ -11 +11 @@
 perlinstall="${prefix}/lib/perl/${perlversion}"
 
-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"
+# You can use a list should you need to force precedence
+#filenames="IPC-Run-0.90 Proc-Daemon-0.14 Sort-Key-1.32 Bit-Vector-7.2"
 
 cd cpan
 # 1. Scan <ext>/packages/cpan for *.tar.gz files
-#for filename in *.tar.gz # gah - doesn't support prereqs
-for filename in filenames
+for filename in *.tar.gz # gah - doesn't support prereqs
+#for filename in $filenames
 do
   # 2. For each found
@@ -24 +25 @@
   # deal with version first, so we can pop it off array
   version=${parts[${#parts[@]}-1]}
-  # - remove .tar.gz and prepend -
-  #version="-${version:0:(${#version} - 7)}"
-  # - just prepend -
+  # - remove .tar.gz
+  version="${version:0:(${#version} - 7)}"
+  # - prepend -
   version="-${version}"
   # - pop!
@@ -73 +74 @@
     else
       # d. Configure
-      opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="${perlinstall}" INSTALLSITELIB="${perlinstall}"
+      opt_run_perl_configure $force_config $auto_config $package $version $prefix INC="${perlinstall}" INSTALLDIRS=site INSTALLSITEARCH="${perlinstall}" INSTALLSITELIB="${perlinstall}"
       # e. Compile
       opt_run_make $compile   $package $version