X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/0e150199b288c3b3d5186fec8b44d7c72e873067..6987f4434e4dfee71506125954ee1ae41c46f1cb:/make_ext.pl diff --git a/make_ext.pl b/make_ext.pl index 126bf73..ce3debd 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -48,6 +48,20 @@ my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')'; # by an '!ext' and are appropriate to the type of building being done. # An extensions follows the format of Foo/Bar, which would be extension Foo::Bar +# To fix dependency ordering, on *nix systems, edit Makefile.SH to create a +# rule. That isn't sufficient for other systems; you also have to do +# something in this file. See the code at +# '# XXX hack for dependency # ordering' +# below. +# +# The basic logic is: +# 1) if there's a Makefile.PL in git for the module, use it. and call make +# 2) If not, auto-generate one (normally) +# 3) unless the auto-generation code figures out that the extension is +# *really* simple, in which case don't. This will be for pure perl +# modules, and all that is needed to be done is to copy from the source +# to the dest directories. +# # It may be deleted in a later release of perl so try to # avoid using it for other purposes. @@ -154,7 +168,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, "-I$topdir\\lib", ("$pl2bat.pl") x 2); + my @args = ($perl, "-I$topdir\\lib", "-I$topdir\\cpan\\ExtUtils-PL2Bat\\lib", ("$pl2bat.pl") x 2); print "@args\n" if $verbose; system(@args) unless IS_CROSS; } @@ -185,10 +199,7 @@ if (IS_WIN32) { next; } push @extspec, $_; - if($_ eq 'DynaLoader' and $target !~ /clean$/) { - # No, we don't know why nmake can't work out the dependency chain - push @{$extra_passthrough{$_}}, 'DynaLoader.c'; - } elsif(FindExt::is_static($_)) { + if($_ ne 'DynaLoader' && FindExt::is_static($_)) { push @{$extra_passthrough{$_}}, 'LINKTYPE=static'; } } @@ -204,25 +215,30 @@ elsif (IS_VMS) { push @extspec, 'DynaLoader' if $dynaloader; } -{ +{ # XXX hack for dependency ordering # Cwd needs to be built before Encode recurses into subdirectories. - # Pod::Simple needs to be built before Pod::Functions + # Pod::Simple needs to be built before Pod::Functions, but after 'if' + # lib needs to be built before IO-Compress # This seems to be the simplest way to ensure this ordering: - my (@first, @other); + my (@first, @second, @other); foreach (@extspec) { - if ($_ eq 'Cwd' || $_ eq 'Pod/Simple') { + if ($_ eq 'Cwd' || $_ eq 'if' || $_ eq 'lib') { push @first, $_; + } + elsif ($_ eq 'Pod/Simple') { + push @second, $_; } else { push @other, $_; } } - @extspec = (@first, @other); + @extspec = (@first, @second, @other); } if ($Config{osname} eq 'catamount' and @extspec) { # Snowball's chance of building extensions. die "This is $Config{osname}, not building $extspec[0], sorry.\n"; } +$ENV{PERL_CORE} = 1; foreach my $spec (@extspec) { my $mname = $spec; @@ -274,7 +290,6 @@ sub build_extension { $perl ||= "$up/miniperl"; my $return_dir = $up; my $lib_dir = "$up/lib"; - $ENV{PERL_CORE} = 1; my ($makefile, $makefile_no_minus_f); if (IS_VMS) { @@ -290,7 +305,7 @@ sub build_extension { if (-f $makefile) { $makefile_no_minus_f = 0; - open my $mfh, $makefile or die "Cannot open $makefile: $!"; + open my $mfh, '<', $makefile or die "Cannot open $makefile: $!"; while (<$mfh>) { # Plagiarised from CPAN::Distribution last if /MakeMaker post_initialize section/; @@ -305,7 +320,7 @@ sub build_extension { last unless defined $oldv; require ExtUtils::MM_Unix; defined (my $newv = parse_version MM $vmod) or last; - if ($newv ne $oldv) { + if (version->parse($newv) ne $oldv) { close $mfh or die "close $makefile: $!"; _unlink($makefile); { @@ -355,36 +370,37 @@ sub build_extension { print "\nCreating Makefile.PL in $ext_dir for $mname\n" if $verbose; my ($fromname, $key, $value); - if ($mname eq 'podlators') { - # We need to special case this somewhere, and this is fewer - # lines of code than a core-only Makefile.PL, and no more - # complex - $fromname = 'VERSION'; - $key = 'DISTNAME'; - $value = 'podlators'; - $mname = 'Pod'; - } else { - $key = 'ABSTRACT_FROM'; - # We need to cope well with various possible layouts - my @dirs = split /::/, $mname; - my $leaf = pop @dirs; - my $leafname = "$leaf.pm"; - my $pathname = join '/', @dirs, $leafname; - my @locations = ($leafname, $pathname, "lib/$pathname"); - unshift @locations, 'lib/IO/Compress/Base.pm' if $mname eq 'IO::Compress'; - foreach (@locations) { - if (-f $_) { - $fromname = $_; - last; - } - } - unless ($fromname) { - die "For $mname tried @locations in $ext_dir but can't find source"; + $key = 'ABSTRACT_FROM'; + # We need to cope well with various possible layouts + my @dirs = split /::/, $mname; + my $leaf = pop @dirs; + my $leafname = "$leaf.pm"; + my $pathname = join '/', @dirs, $leafname; + my @locations = ($leafname, $pathname, "lib/$pathname"); + foreach (@locations) { + if (-f $_) { + $fromname = $_; + last; } - ($value = $fromname) =~ s/\.pm\z/.pod/; - $value = $fromname unless -e $value; - } + } + + unless ($fromname) { + die "For $mname tried @locations in $ext_dir but can't find source"; + } + ($value = $fromname) =~ s/\.pm\z/.pod/; + $value = $fromname unless -e $value; + + if ($mname eq 'Pod::Checker') { + # the abstract in the .pm file is unparseable by MM, + # so special-case it. We can't use the package's own + # Makefile.PL, as it doesn't handle the executable scripts + # right. + $key = 'ABSTRACT'; + # this is copied from the CPAN Makefile.PL v 1.171 + $value = 'Pod::Checker verifies POD documentation contents for compliance with the POD format specifications'; + } + open my $fh, '>', 'Makefile.PL' or die "Can't open Makefile.PL for writing: $!"; printf $fh <<'EOM', $0, $mname, $fromname, $key, $value; @@ -507,13 +523,18 @@ EOM 'INSTALLMAN3DIR=none'; } push @args, @$pass_through; + push @args, 'PERL=' . $perl if $perl; # use miniperl to run the Makefile later _quote_args(\@args) if IS_VMS; print join(' ', $perl, @args), "\n" if $verbose; my $code = do { local $ENV{PERL_MM_USE_DEFAULT} = 1; system $perl, @args; }; - warn "$code from $ext_dir\'s Makefile.PL" if $code; + if($code != 0){ + #make sure next build attempt/run of make_ext.pl doesn't succeed + _unlink($makefile); + die "Unsuccessful Makefile.PL($ext_dir): code=$code"; + } # Right. The reason for this little hack is that we're sitting inside # a program run by ./miniperl, but there are tasks we need to perform @@ -557,16 +578,13 @@ EOS ); } - if (!$target or $target !~ /clean$/) { - # Give makefile an opportunity to rewrite itself. - # reassure users that life goes on... - my @args = ('config', @$pass_through); - system(@make, @args) and print "@make @args failed, continuing anyway...\n"; - } my @targ = ($target, @$pass_through); print "Making $target in $ext_dir\n@make @targ\n" if $verbose; local $ENV{PERL_INSTALL_QUIET} = 1; my $code = system(@make, @targ); + if($code >> 8 != 0){ # probably cleaned itself, try again once more time + $code = system(@make, @targ); + } die "Unsuccessful make($ext_dir): code=$code" if $code != 0; chdir $return_dir || die "Cannot cd to $return_dir: $!"; @@ -608,6 +626,7 @@ sub just_pm_to_blib { my ($first) = $mname =~ /^([^:]+)/; my $pm_to_blib = IS_VMS ? 'pm_to_blib.ts' : 'pm_to_blib'; + my $silent = defined $ENV{MAKEFLAGS} && $ENV{MAKEFLAGS} =~ /\b(s|silent|quiet)\b/; foreach my $leaf (<*>) { if (-d $leaf) { @@ -652,7 +671,8 @@ sub just_pm_to_blib { die "Inconsistent module $mname has both lib/ and $first/" if $has_lib && $has_topdir; - print "\nRunning pm_to_blib for $ext_dir directly\n"; + print "Running pm_to_blib for $ext_dir directly\n" + unless $silent; my %pm; if ($has_top) { @@ -698,20 +718,37 @@ sub just_pm_to_blib { } # This is running under miniperl, so no autodie if ($target eq 'all') { - local $ENV{PERL_INSTALL_QUIET} = 1; - require ExtUtils::Install; - ExtUtils::Install::pm_to_blib(\%pm, '../../lib/auto'); - open my $fh, '>', $pm_to_blib - or die "Can't open '$pm_to_blib': $!"; - print $fh "$0 has handled pm_to_blib directly\n"; - close $fh - or die "Can't close '$pm_to_blib': $!"; - if (IS_UNIX) { - # Fake the fallback cleanup - my $fallback - = join '', map {s!^\.\./\.\./!!; "rm -f $_\n"} sort values %pm; - foreach my $clean_target ('realclean', 'veryclean') { - fallback_cleanup($return_dir, $clean_target, $fallback); + my $need_update = 1; + if (-f $pm_to_blib) { + # avoid touching pm_to_blib unless there's something that + # needs updating, see #126710 + $need_update = 0; + my $test_at = -M _; + while (my $from = each(%pm)) { + if (-M $from < $test_at) { + ++$need_update; + last; + } + } + keys %pm; # reset iterator + } + + if ($need_update) { + local $ENV{PERL_INSTALL_QUIET} = 1; + require ExtUtils::Install; + ExtUtils::Install::pm_to_blib(\%pm, '../../lib/auto'); + open my $fh, '>', $pm_to_blib + or die "Can't open '$pm_to_blib': $!"; + print $fh "$0 has handled pm_to_blib directly\n"; + close $fh + or die "Can't close '$pm_to_blib': $!"; + if (IS_UNIX) { + # Fake the fallback cleanup + my $fallback + = join '', map {s!^\.\./\.\./!!; "rm -f $_\n"} sort values %pm; + foreach my $clean_target ('realclean', 'veryclean') { + fallback_cleanup($return_dir, $clean_target, $fallback); + } } } } else {