[Bast-commits] r7168 - local-lib/1.000/trunk

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-08-02 23:45:11 +0000 (Sun, 02 Aug 2009)
New Revision: 7168

Modified:
   local-lib/1.000/trunk/Changes
   local-lib/1.000/trunk/Makefile.PL
Log:
Damn slow lorries

Modified: local-lib/1.000/trunk/Changes
===================================================================
--- local-lib/1.000/trunk/Changes	2009-08-02 12:10:53 UTC (rev 7167)
+++ local-lib/1.000/trunk/Changes	2009-08-02 23:45:11 UTC (rev 7168)
@@ -1,5 +1,8 @@
 Revision history for local::lib
 
+        - Add dependency on Extutils::Install 1.43 and install in --bootstrap
+          otherwise we fail to build with latest MakeMaker on OpenSolaris (t0m)
+
 1.004003 2009-16-16
         - Stop Makefile.PL exploding if your CPAN is too old to have
           CPAN::HandleConfig. Needed when installing local::lib via CPAN

Modified: local-lib/1.000/trunk/Makefile.PL
===================================================================
--- local-lib/1.000/trunk/Makefile.PL	2009-08-02 12:10:53 UTC (rev 7167)
+++ local-lib/1.000/trunk/Makefile.PL	2009-08-02 23:45:11 UTC (rev 7168)
@@ -46,6 +46,9 @@
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
     my $eumm = $? >> 8;
 
+    system($^X, '-MExtUtils::Install 1.43', '-e1');
+    my $eui = $? >> 8;
+
     system($^X, '-MCPAN 1.80', '-e1');
     my $cpan = $? >> 8;
     my $cpan_command = '';
@@ -76,6 +79,9 @@
     if ($eumm) { # non-zero exit
       $cpan_command .= 'force("install","ExtUtils::MakeMaker"); ';
     }
+    if ($eui) {
+      $cpan_command .= 'install("ExtUtils::Install"); ';
+    }
     if ($cpan) {
       $cpan_command .= 'force("install","CPAN"); ';
     }
@@ -96,6 +102,7 @@
 all_from 'lib/local/lib.pm';
 
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
+requires 'ExtUtils::Install' => '1.43'; # ditto
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';
 requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change