Fix building MAD with C++ - a MAD_PV of "" is illegal, as it will be free()d.

[p5sagit/p5-mst-13.2.git] / make_ext.pl

diff --git a/make_ext.pl b/make_ext.pl
index cfc12c2..0e0bc9b 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -2,8 +2,25 @@
 use strict;
 use warnings;
 use Config;
+BEGIN {
+    unshift @INC, $^O eq 'MSWin32' ? '../ext/Cwd' : 'ext/Cwd';
+}
 use Cwd;
 
+# To clarify, this isn't the entire suite of modules considered "toolchain"
+# It's not even all modules needed to build ext/
+# It's just the source paths of the (minimum complete set of) modules in ext/
+# needed to build the nonxs modules
+# After which, all nonxs modules are in lib, which was always sufficient to
+# allow miniperl to build everything else.
+
+my @toolchain = qw(ext/constant/lib ext/Cwd ext/Cwd/lib ext/ExtUtils-Command/lib
+                  ext/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib
+                  ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib
+       ext/File-Path/lib ext/AutoLoader/lib);
+
+my @ext_dirs = qw(ext cpan);
+
 # This script acts as a simple interface for building extensions.
 
 # It's actually a cut and shut of the Unix version ext/utils/makeext and the
@@ -16,7 +33,9 @@ use Cwd;
 #
 # On Windows or VMS,
 # If '--static' is specified, static extensions will be built.
-# If '--dynamic' is specified, dynamic (and nonxs) extensions will be built.
+# If '--dynamic' is specified, dynamic extensions will be built.
+# If '--nonxs' is specified, nonxs extensions will be built.
+# If '--dynaloader' is specificied, DynaLoader will be built.
 # If '--all' is specified, all extensions will be built.
 #
 #    make_ext.pl "MAKE=make [-make_opts]" --dir=directory [--target=target] [--static|--dynamic|--all] +ext2 !ext1
@@ -67,6 +86,8 @@ foreach (@ARGV) {
 
 my $static = $opts{static} || $opts{all};
 my $dynamic = $opts{dynamic} || $opts{all};
+my $nonxs = $opts{nonxs} || $opts{all};
+my $dynaloader = $opts{dynaloader} || $opts{all};
 
 # The Perl Makefile.SH will expand all extensions to
 #      lib/auto/X/X.a  (or lib/auto/X/Y/Y.a if nested)
@@ -126,7 +147,7 @@ if ($target eq '') {
     die "$0: unknown make target '$target'\n";
 }
 
-if (!@extspec and !$static and !$dynamic)  {
+if (!@extspec and !$static and !$dynamic and !$nonxs and !$dynaloader)  {
     die "$0: no extension specified\n";
 }
 
@@ -144,7 +165,7 @@ if ($is_Win32) {
     $ENV{PATH} = "$topdir;$topdir\\win32\\bin;$ENV{PATH}";
     my $pl2bat = "$topdir\\win32\\bin\\pl2bat";
     unless (-f "$pl2bat.bat") {
-       my @args = ($perl, ("$pl2bat.pl") x 2);
+       my @args = ($perl, "-I$topdir\\lib", ("$pl2bat.pl") x 2);
        print "@args\n";
        system(@args) unless defined $::Cross::platform;
     }
@@ -157,7 +178,9 @@ if ($is_Win32) {
 
     my @ext;
     push @ext, FindExt::static_ext() if $static;
-    push @ext, FindExt::dynamic_ext(), FindExt::nonxs_ext() if $dynamic;
+    push @ext, FindExt::dynamic_ext() if $dynamic;
+    push @ext, FindExt::nonxs_ext() if $nonxs;
+    push @ext, 'DynaLoader' if $dynaloader;
 
     foreach (sort @ext) {
        if (%incl and !exists $incl{$_}) {
@@ -169,7 +192,10 @@ if ($is_Win32) {
            next;
        }
        push @extspec, $_;
-       if(FindExt::is_static($_)) {
+       if($_ eq 'DynaLoader') {
+           # No, we don't know why nmake can't work out the dependency chain
+           push @{$extra_passthrough{$_}}, 'DynaLoader.c';
+       } elsif(FindExt::is_static($_)) {
            push @{$extra_passthrough{$_}}, 'LINKTYPE=static';
        }
     }
@@ -179,7 +205,22 @@ elsif ($is_VMS) {
     $perl = $^X;
     push @extspec, (split ' ', $Config{static_ext}) if $static;
     push @extspec, (split ' ', $Config{dynamic_ext}) if $dynamic;
-    push @extspec, (split ' ', $Config{nonxs_ext}) if $dynamic;
+    push @extspec, (split ' ', $Config{nonxs_ext}) if $nonxs;
+    push @extspec, 'DynaLoader' if $dynaloader;
+}
+
+{
+    # Cwd needs to be built before Encode recurses into subdirectories.
+    # This seems to be the simplest way to ensure this ordering:
+    my (@first, @other);
+    foreach (@extspec) {
+       if ($_ eq 'Cwd') {
+           push @first, $_;
+       } else {
+           push @other, $_;
+       }
+    }
+    @extspec = (@first, @other);
 }
 
 foreach my $spec (@extspec)  {
@@ -193,7 +234,16 @@ foreach my $spec (@extspec)  {
        # New style ext/Data-Dumper/
        my $copy = $spec;
        $copy =~ tr!/!-!;
-       $ext_pathname = "ext/$copy";
+       foreach my $dir (@ext_dirs) {
+           if (-d "$dir/$copy") {
+               $ext_pathname = "$dir/$copy";
+               last;
+           }
+       }
+       if (!defined $ext_pathname) {
+           warn "Can't find extension $spec in any of @ext_dirs";
+           next;
+       }
     }
 
     if ($Config{osname} eq 'catamount') {
@@ -216,7 +266,12 @@ sub build_extension {
     $perl ||= "$up/miniperl";
     my $return_dir = $up;
     my $lib_dir = "$up/lib";
-    $ENV{PERL5LIB} = $lib_dir;
+    # $lib_dir must be last, as we're copying files into it, and in a parallel
+    # make there's a race condition if one process tries to open a module that
+    # another process has half-written.
+    $ENV{PERL5LIB}
+       = join $Config{path_sep}, (map {"$up/$_"} @toolchain), $lib_dir;
+    $ENV{PERL_CORE} = 1;
 
     unless (chdir "$ext_dir") {
        warn "Cannot cd to $ext_dir: $!";