Changeset 26256 for trunk/psconfig/pscheckperl

Timestamp:

Nov 22, 2009, 2:52:46 PM (17 years ago)

Author:

eugene

Message:

Fixed a number of build issues:

1) magic and gpcsw had problems with collisions in multithreaded build (-j4)
2) some missing perl dependencies (at least on my ubuntu box)
3) XML-NamespaceSupport-1.10.tar.gz requires an additional flag of the build line to avoid

having it run a CPAN query. I added a feature to supply such build line options, requiring
an update of the perl table

File:

• trunk/psconfig/pscheckperl (modified) (4 diffs)

trunk/psconfig/pscheckperl

@@ -78 +78 @@
     if ($line =~ m|^\s*\#|) { next; }
 
-    ($N, $module, $tarball, $modver, $prompts) = split (" ", $line);
+    $Nvalue = ($N, $module, $tarball, $modver, $buildopts, $prompts) = split (" ", $line);
+    if ($Nvalue < 6) {
+        print "Error in perl module config line $line\n";
+        exit 1;
+    }
+    # print "N: $N, module: $module, tarball: $tarball, modver: $modver, buildopts: $buildopts, prompts: $prompts\n";
 
-    if ($modver eq "") { $modver = 0; }
+    # we require the number of fields to be fixed, so this test is now invalid:
+    # if ($modver eq "") { $modver = 0; }
+
     system ("pscheckmods $module $modver");
     if (($? == 0) and not defined $force{$module} and not defined $force{'all'}) {
@@ -109 +116 @@
     chdir $tardir;
 
+    # we use NONE as the empty word
+    if ($buildopts eq "NONE") { $buildopts = ""; }
+    if ($prompts eq "NONE") { $prompts = ""; }
+
     if (-e "Build.PL") {
         # vsystem("perl Build.PL --install_path lib=$perldir ");
-        vsystem("perl Build.PL --install_base $prefix");
+        vsystem("perl Build.PL --install_base $prefix $buildopts");
         vsystem("Build");
         vsystem("Build install");
@@ -118 +129 @@
         if ($prompts) {
             @answers = split (",", $prompts);
-            open (PIPE, "|perl Makefile.PL PREFIX=$prefix LIB=$perldir");
+            open (PIPE, "|perl Makefile.PL PREFIX=$prefix LIB=$perldir $buildopts");
             foreach $answer (@answers) {
                 print PIPE "$answer\n";
@@ -124 +135 @@
             close (PIPE);
         } else {
-            vsystem ("perl Makefile.PL PREFIX=$prefix LIB=$perldir");
+            vsystem ("perl Makefile.PL PREFIX=$prefix LIB=$perldir $buildopts");
         }
-
         vsystem ("make < /dev/null");
         vsystem ("make install");