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);
+
# 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
#
# 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
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)
} elsif (s{^ext/}{}) {
# Remove ext/ prefix and /pm_to_blib suffix
s{/pm_to_blib$}{};
+ # Targets are given as files on disk, but the extension spec is still
+ # written using /s for each ::
+ tr!-!/!;
} elsif (s{::}{\/}g) {
# Convert :: to /
} else {
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";
}
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{$_}) {
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';
}
}
$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 $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) {
if (-d "ext/$spec") {
# Old style ext/Data/Dumper/
$ext_pathname = "ext/$spec";
- } elsif ($is_VMS and -d "vms/ext/" . substr($spec, 4)) {
- # We could get rid of this by moving everything from
- # [.vms.ext...] to [.ext.VMS...]
- $ext_pathname = "vms/ext/" . substr($spec, 4);
} else {
# New style ext/Data-Dumper/
my $copy = $spec;
$copy =~ tr!/!-!;
$ext_pathname = "ext/$copy";
}
- my $up = $ext_pathname;
- $up =~ s![^/]+!..!g;
if ($Config{osname} eq 'catamount') {
# Snowball's chance of building extensions.
print "\tMaking $mname ($target)\n";
- build_extension('ext', $ext_pathname, $up, $perl || "$up/miniperl",
- "$up/lib", $mname,
+ build_extension($ext_pathname, $perl, $mname,
[@pass_through, @{$extra_passthrough{$spec} || []}]);
}
sub build_extension {
- my ($ext, $ext_dir, $return_dir, $perl, $lib_dir, $mname, $pass_through)
- = @_;
+ my ($ext_dir, $perl, $mname, $pass_through) = @_;
+
+ my $up = $ext_dir;
+ $up =~ s![^/]+!..!g;
+
+ $perl ||= "$up/miniperl";
+ my $return_dir = $up;
+ my $lib_dir = "$up/lib";
+ # $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: $!";
return;
@cross = '-MCross';
}
- my @args = ("-I$lib_dir", @cross, 'Makefile.PL');
+ my @args = (@cross, 'Makefile.PL');
if ($is_VMS) {
my $libd = VMS::Filespec::vmspath($lib_dir);
push @args, "INST_LIB=$libd", "INST_ARCHLIB=$libd";
} else {
- push @args, 'INSTALLDIRS=perl', 'INSTALLMAN3DIR=none';
+ push @args, 'INSTALLDIRS=perl', 'INSTALLMAN1DIR=none',
+ 'INSTALLMAN3DIR=none';
}
push @args, @$pass_through;
_quote_args(\@args) if $is_VMS;
projects / p5sagit/p5-mst-13.2.git / blobdiff