4 use Getopt::Long qw(:config bundling no_auto_abbrev);
9 = qw(config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep);
12 if (open my $fh, '<', '/proc/cpuinfo') {
14 ++$cpus if /^processor\s+:\s+\d+$/;
16 } elsif (-x '/sbin/sysctl') {
17 $cpus = 1 + $1 if `/sbin/sysctl hw.ncpu` =~ /^hw\.ncpu: (\d+)$/;
18 } elsif (-x '/usr/bin/getconf') {
19 $cpus = 1 + $1 if `/usr/bin/getconf _NPROCESSORS_ONLN` =~ /^(\d+)$/;
24 jobs => defined $cpus ? $cpus + 1 : 2,
26 clean => 1, # mostly for debugging this
29 my @paths = qw(/usr/local/lib64 /lib64 /usr/lib64);
37 (`uname -sm` eq "Linux x86_64\n" ? (libpth => \@paths) : ()),
40 unless(GetOptions(\%options,
41 'target=s', 'jobs|j=i', 'expect-pass=i',
42 'expect-fail' => sub { $options{'expect-pass'} = 0; },
43 'clean!', 'one-liner|e=s', 'match=s', 'force-manifest',
44 'test-build', 'check-args', 'A=s@', 'usage|help|?',
46 my (undef, $val) = @_;
47 if ($val =~ /\A([^=]+)=(.*)/s) {
48 $defines{$1} = length $2 ? $2 : "\0";
54 $defines{$_[1]} = undef;
57 pod2usage(exitval => 255, verbose => 1);
60 my ($target, $j, $match) = @options{qw(target jobs match)};
62 pod2usage(exitval => 255, verbose => 1) if $options{usage};
63 pod2usage(exitval => 255, verbose => 1)
64 unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
66 exit 0 if $options{'check-args'};
70 bisect.pl - use git bisect to pinpoint changes
74 # When did this become an error?
75 .../Porting/bisect.pl -e 'my $a := 2;'
76 # When did this stop being an error?
77 .../Porting/bisect.pl --expect-fail -e '1 // 2'
78 # When did this stop matching?
79 .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
80 # When did this start matching?
81 .../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
82 # When did this test program stop working?
83 .../Porting/bisect.pl --target=perl -- ./perl -Ilib test_prog.pl
84 # When did this first become valid syntax?
85 .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
86 --expect-fail -e 'my $a := 2;'
87 # What was the last revision to build with these options?
88 .../Porting/bisect.pl --test-build -Dd_dosuid
92 Together C<bisect.pl> and C<bisect-runner.pl> attempt to automate the use
93 of C<git bisect> as much as possible. With one command (and no other files)
100 Which commit caused this example code to break?
104 Which commit caused this example code to start working?
108 Which commit added the first to match this regex?
112 Which commit removed the last to match this regex?
116 usually without needing to know which versions of perl to use as start and
119 By default C<bisect.pl> will process all options, then use the rest of the
120 command line as arguments to list C<system> to run a test case. By default,
121 the test case should pass (exit with 0) on earlier perls, and fail (exit
122 non-zero) on I<blead>. C<bisect.pl> will use C<bisect-runner.pl> to find the
123 earliest stable perl version on which the test case passes, check that it
124 fails on blead, and then use C<bisect-runner.pl> with C<git bisect run> to
125 find the commit which caused the failure.
127 Because the test case is the complete argument to C<system>, it is easy to
128 run something other than the F<perl> built, if necessary. If you need to run
129 the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>
131 You need a clean checkout to run a bisect, and you can't use the checkout
132 which contains F<Porting/bisect.pl> (because C<git bisect>) will check out
133 a revision before F<Porting/bisect-runner.pl> was added, which
134 C<git bisect run> needs). If your working checkout is called F<perl>, the
135 simplest solution is to make a local clone, and run from that. I<i.e.>:
140 ../perl/Porting/bisect.pl ...
148 --start I<commit-ish>
150 Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
151 else C<git> understands as a revision). If not specified, C<bisect.pl> will
152 search stable perl releases from 5.002 to 5.14.0 until it finds one where
153 the test case passes.
159 Most recent revision to test, as a I<commit-ish>. If not specified, defaults
166 F<Makefile> target (or equivalent) needed, to run the test case. If specified,
167 this should be one of
175 Just run C<Configure>
181 Run the various F<*.SH> files to generate F<Makefile>, F<config.h>, I<etc>.
193 Use F<miniperl> to build F<lib/Config.pm>
199 Build F<lib/auto/Fcntl/Fnctl.so> (strictly, C<.$Config{so}>). As L<Fcntl>
200 is simple XS module present since 5.000, this provides a fast test of
201 whether XS modules can be built. Note, XS modules are built by F<miniperl>,
202 hence this target will not build F<perl>.
208 Build F<perl>. This also builds pure-Perl modules in F<cpan>, F<dist> and
209 F<ext>. XS modules (such as L<Fcntl>) are not built.
215 Build everything needed to run the tests. This is the default if we're
216 running test code, but is time consuming, as it means building all
217 XS modules. For older F<Makefile>s, the previous name of C<test-prep>
218 is automatically substituted. For very old F<Makefile>s, C<make test> is
219 run, as there is no target provided to just get things ready, and for 5.004
220 and earlier the tests run very quickly.
226 --one-liner 'code to run'
232 Example code to run, just like you'd use with C<perl -e>.
234 This prepends C<./perl -Ilib -e 'code to run'> to the test case given,
235 or C<./miniperl> if I<target> is C<miniperl>.
237 (Usually you'll use C<-e> instead of providing a test case in the
238 non-option arguments to C<bisect.pl>)
240 C<-E> intentionally isn't supported, as it's an error in 5.8.0 and earlier,
241 which interferes with detecting errors in the example code itself.
247 The test case should fail for the I<start> revision, and pass for the I<end>
248 revision. The bisect run will find the first commit where it passes.
260 -Accflags=-DNO_MATHOMS
262 Arguments to pass to F<Configure>. Repeated C<-A> arguments are passed
263 through as is. C<-D> and C<-U> are processed in order, and override
264 previous settings for the same parameter.
274 Number of C<make> jobs to run in parallel. If F</proc/cpuinfo> exists and
275 can be parsed, or F</sbin/sysctl> exists and reports C<hw.ncpu>, or
276 F</usr/bin/getconf> exists and reports C<_NPROCESSORS_ONLN> defaults to 1 +
277 I<number of CPUs>. Otherwise defaults to 2.
283 Instead of running a test program to determine I<pass> or I<fail>, pass
284 if the given regex matches, and hence search for the commit that removes
285 the last matching file.
287 If no I<target> is specified, the match is against all files in the
288 repository (which is fast). If a I<target> is specified, that target is
289 built, and the match is against only the built files. C<--expect-fail> can
290 be used with C<--match> to search for a commit that adds files that match.
296 Test that the build completes, without running any test case.
298 By default, if the build for the desired I<target> fails to complete,
299 F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
300 being that one wants to find a commit which changed state "builds && passes"
301 to "builds && fails". If instead one is interested in which commit broke the
302 build (possibly for particular F<Configure> options), use I<--test-build>
303 to treat a build failure as a failure, not a "skip".
305 Often this option isn't as useful as it first seems, because I<any> build
306 failure will be reported to C<git bisect> as a failure, not just the failure
307 that you're interested in. Generally, to debug a particular problem, it's
308 more useful to use a I<target> that builds properly at the point of interest,
309 and then a test case that runs C<make>. For example:
311 .../Porting/bisect.pl --start=perl-5.000 --end=perl-5.002 \
312 --expect-fail --force-manifest --target=miniperl make perl
314 will find the first revision capable of building C<DynaLoader> and then
315 C<perl>, without becoming confused by revisions where C<miniperl> won't
322 By default, a build will "skip" if any files listed in F<MANIFEST> are not
323 present. Usually this is useful, as it avoids false-failures. However, there
324 are some long ranges of commits where listed files are missing, which can
325 cause a bisect to abort because all that remain are skipped revisions.
327 In these cases, particularly if the test case uses F<miniperl> and no modules,
328 it may be more useful to force the build to continue, even if files
329 F<MANIFEST> are missing.
335 C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
341 Tell F<bisect-runner.pl> not to clean up after the build. This allows one
342 to use F<bisect-runner.pl> to build the current particular perl revision for
343 interactive testing, or for debugging F<bisect-runner.pl>.
345 Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
351 Validate the options and arguments, and exit silently if they are valid.
365 Display the usage information and exit.
371 die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
373 $j = "-j$j" if $j =~ /\A\d+\z/;
375 # Sadly, however hard we try, I don't think that it will be possible to build
376 # modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
377 # which updated to MakeMaker 3.7, which changed from using a hard coded ld
378 # in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
380 sub extract_from_file {
381 my ($file, $rx, $default) = @_;
382 open my $fh, '<', $file or die "Can't open $file: $!";
385 return wantarray ? @got : $got[0]
388 return $default if defined $default;
393 my ($file, $munger) = @_;
395 open my $fh, '<', $file or die "Can't open $file: $!";
397 die "Can't read $file: $!" unless defined $orig && close $fh;
398 my $new = $munger->($orig);
399 return if $new eq $orig;
400 open $fh, '>', $file or die "Can't open $file: $!";
401 print $fh $new or die "Can't print to $file: $!";
402 close $fh or die "Can't close $file: $!";
408 my ($file) = $patch =~ qr!^diff.*a/(\S+) b/\1!;
409 open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
412 print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
413 die "Can't patch $file: $?, $!";
417 if ($options{clean}) {
418 # Needed, because files that are build products in this checked out
419 # version might be in git in the next desired version.
420 system 'git clean -dxf </dev/null';
421 # Needed, because at some revisions the build alters checked out files.
422 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
423 system 'git reset --hard HEAD </dev/null';
430 warn "skipping - $reason";
434 sub report_and_exit {
435 my ($ret, $pass, $fail, $desc) = @_;
439 my $got = ($options{'expect-pass'} ? !$ret : $ret) ? 'good' : 'bad';
441 print "$got - $fail $desc\n";
443 print "$got - $pass $desc\n";
457 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
461 foreach my $file (@files) {
462 open my $fh, '<', $file or die "Can't open $file: $!";
466 if (tr/\t\r\n -~\200-\377//c) {
467 print "Binary file $file matches\n";
469 $_ .= "\n" unless /\n\z/;
474 close $fh or die "Can't close $file: $!";
476 report_and_exit(!$matches,
477 $matches == 1 ? '1 match for' : "$matches matches for",
478 'no matches for', $match);
481 # Not going to assume that system perl is yet new enough to have autodie
482 system 'git clean -dxf </dev/null' and die;
484 if (!defined $target) {
485 match_and_exit() if $match;
486 $target = 'test_prep';
489 skip('no Configure - is this the //depot/perlext/Compiler branch?')
490 unless -f 'Configure';
492 # This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
494 = extract_from_file('patchlevel.h',
495 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
499 if (extract_from_file('Configure',
500 qr/^ \*=\*\) echo "\$1" >> \$optdef;;$/)) {
501 # This is " Spaces now allowed in -D command line options.",
502 # part of commit ecfc54246c2a6f42
503 apply_patch(<<'EOPATCH');
504 diff --git a/Configure b/Configure
505 index 3d3b38d..78ffe16 100755
508 @@ -652,7 +777,8 @@ while test $# -gt 0; do
509 echo "$me: use '-U symbol=', not '-D symbol='." >&2
510 echo "$me: ignoring -D $1" >&2
512 - *=*) echo "$1" >> $optdef;;
514 + sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
515 *) echo "$1='define'" >> $optdef;;
520 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
521 # Configure's original simple "grep" for d_namlen falls foul of the
522 # approach taken by the glibc headers:
523 # #ifdef _DIRENT_HAVE_D_NAMLEN
524 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
526 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
527 # This is also part of commit ecfc54246c2a6f42
528 apply_patch(<<'EOPATCH');
529 diff --git a/Configure b/Configure
530 index 3d3b38d..78ffe16 100755
533 @@ -3935,7 +4045,8 @@ $rm -f try.c
535 : see if the directory entry stores field length
537 -if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
538 +$cppstdin $cppflags $cppminus < "$xinc" > try.c
539 +if $contains 'd_namlen' try.c >/dev/null 2>&1; then
540 echo "Good, your directory entry keeps length information in d_namlen." >&4
547 if ($major < 5 && extract_from_file('Configure',
548 qr/^if test ! -t 0; then$/)) {
549 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was not a
550 # tty. With that commit, the tty requirement was dropped for -de and -dE
551 # For those older versions, it's probably easiest if we simply remove the
553 apply_patch(<<'EOPATCH');
554 diff --git a/Configure b/Configure
555 index 0071a7c..8a61caa 100755
558 @@ -93,7 +93,2 @@ esac
561 -if test ! -t 0; then
562 - echo "Say 'sh $me', not 'sh <$me'"
569 if ($major < 10 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
570 # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as
571 # prior to bd9b35c97ad661cc Configure had the malloc.h test before the
572 # definition of $compile.
573 apply_patch(<<'EOPATCH');
574 diff --git a/Configure b/Configure
575 index 3d2e8b9..6ce7766 100755
578 @@ -6743,5 +6743,22 @@ set d_dosuid
580 : see if this is a malloc.h system
581 -set malloc.h i_malloc
583 +: we want a real compile instead of Inhdr because some systems have a
584 +: malloc.h that just gives a compile error saying to use stdlib.h instead
589 +int main () { return 0; }
592 +if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then
593 + echo "<malloc.h> found." >&4
596 + echo "<malloc.h> NOT found." >&4
606 if ($major < 10 && -d 'ext/Unicode/Normalize/'
607 && !extract_from_file('Configure', qr/^extra_dep=''$/)) {
608 # The Makefile.PL for Unicode::Normalize needs
609 # lib/unicore/CombiningClass.pl. Even without a parallel build, we need
610 # a dependency to ensure that it builds. This is a variant of commit
612 apply_patch(<<'EOPATCH');
613 diff --git a/Makefile.SH b/Makefile.SH
614 index f61d0db..6097954 100644
617 @@ -155,10 +155,20 @@ esac
619 : Prepare dependency lists for Makefile.
622 for f in $dynamic_ext; do
623 : the dependency named here will never exist
624 base=`echo "$f" | sed 's/.*\///'`
625 - dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
626 + this_target="lib/auto/$f/$base.$dlext"
627 + dynamic_list="$dynamic_list $this_target"
629 + : Parallel makes reveal that we have some interdependencies
631 + Math/BigInt/FastCalc) extra_dep="$extra_dep
632 +$this_target: lib/auto/List/Util/Util.$dlext" ;;
633 + Unicode/Normalize) extra_dep="$extra_dep
634 +$this_target: lib/unicore/CombiningClass.pl" ;;
639 @@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
640 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
643 +$spitshell >>Makefile <<EOF
647 +$spitshell >>Makefile <<'!NO!SUBS!'
652 # There was a bug in makedepend.SH which was fixed in version 96a8704c.
653 # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
654 # Remove this if you're actually bisecting a problem related to makedepend.SH
655 system 'git show blead:makedepend.SH > makedepend.SH </dev/null' and die;
657 if ($^O eq 'freebsd') {
658 # There are rather too many version-specific FreeBSD hints fixes to patch
659 # individually. Also, more than once the FreeBSD hints file has been
660 # written in what turned out to be a rather non-future-proof style,
661 # with case statements treating the most recent version as the exception,
662 # instead of treating previous versions' behaviour explicitly and changing
663 # the default to cater for the current behaviour. (As strangely, future
664 # versions inherit the current behaviour.)
665 system 'git show blead:hints/freebsd.sh > hints/freebsd.sh </dev/null'
669 # 5.002 Configure and later have code to
671 # : Try to guess additional flags to pick up local libraries.
673 # which will automatically add --L/usr/local/lib because libpth
674 # contains /usr/local/lib
676 # Without it, if Configure finds libraries in /usr/local/lib (eg
677 # libgdbm.so) and adds them to the compiler commandline (as -lgdbm),
678 # then the link will fail. We can't fix this up in config.sh because
679 # the link will *also* fail in the test compiles that Configure does
680 # (eg $inlibc) which makes Configure get all sorts of things
681 # wrong. :-( So bodge it here.
683 # Possibly other platforms will need something similar. (if they
684 # have "wanted" libraries in /usr/local/lib, but the compiler
685 # doesn't default to putting that directory in its link path)
686 apply_patch(<<'EOPATCH');
687 --- perl2/hints/freebsd.sh.orig 2011-10-05 16:44:55.000000000 +0200
688 +++ perl2/hints/freebsd.sh 2011-10-05 16:45:52.000000000 +0200
691 libpth="/usr/lib /usr/local/lib"
692 glibpth="/usr/lib /usr/local/lib"
694 + ldflags="-Wl,-E -L/usr/local/lib "
697 cccdlflags='-DPIC -fPIC'
700 libpth="/usr/lib /usr/local/lib"
701 glibpth="/usr/lib /usr/local/lib"
703 + ldflags="-Wl,-E -L/usr/local/lib "
705 cccdlflags='-DPIC -fPIC'
711 # if Encode is not needed for the test, you can speed up the bisect by
712 # excluding it from the runs with -Dnoextensions=Encode
713 # ccache is an easy win. Remove it if it causes problems.
714 # Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
715 # to true in hints/linux.sh
716 # On dromedary, from that point on, Configure (by default) fails to find any
717 # libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
718 # versioned libraries. Without -lm, the build fails.
719 # Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
720 # until commit faae14e6e968e1c0 adds it to the hints.
721 # However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
722 # because it will spot versioned libraries, pass them to the compiler, and then
723 # bail out pretty early on. Configure won't let us override libswanted, but it
724 # will let us override the entire libs list.
726 unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
727 # Before 1cfa4ec74d4933da, so force the libs list.
730 # This is the current libswanted list from Configure, less the libs removed
731 # by current hints/linux.sh
732 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld
733 ld sun m crypt sec util c cposix posix ucb BSD)) {
734 foreach my $dir (@paths) {
735 next unless -f "$dir/lib$lib.so";
736 push @libs, "-l$lib";
740 $defines{libs} = \@libs unless exists $defines{libs};
743 # This seems to be necessary to avoid makedepend becoming confused, and hanging
744 # on stdin. Seems that the code after make shlist || ...here... is never run.
745 $defines{trnl} = q{'\n'}
746 if $major < 4 && !exists $defines{trnl};
748 $defines{usenm} = undef
749 if $major < 2 && !exists $defines{usenm};
751 my (@missing, @created_dirs);
753 if ($options{'force-manifest'}) {
754 open my $fh, '<', 'MANIFEST'
755 or die "Could not open MANIFEST: $!";
757 next unless /^(\S+)/;
761 close $fh or die "Can't close MANIFEST: $!";
763 foreach my $pathname (@missing) {
764 my @parts = split '/', $pathname;
765 my $leaf = pop @parts;
768 $path .= '/' . shift @parts;
770 mkdir $path, 0700 or die "Can't create $path: $!";
771 unshift @created_dirs, $path;
773 open $fh, '>', $pathname or die "Can't open $pathname: $!";
774 close $fh or die "Can't close $pathname: $!";
775 chmod 0, $pathname or die "Can't chmod 0 $pathname: $!";
779 my @ARGS = $target eq 'config.sh' ? '-dEs' : '-des';
780 foreach my $key (sort keys %defines) {
781 my $val = $defines{$key};
783 push @ARGS, "-D$key=@$val";
784 } elsif (!defined $val) {
785 push @ARGS, "-U$key";
786 } elsif (!length $val) {
787 push @ARGS, "-D$key";
789 $val = "" if $val eq "\0";
790 push @ARGS, "-D$key=$val";
793 push @ARGS, map {"-A$_"} @{$options{A}};
795 # </dev/null because it seems that some earlier versions of Configure can
796 # call commands in a way that now has them reading from stdin (and hanging)
798 die "Can't fork: $!" unless defined $pid;
800 open STDIN, '<', '/dev/null';
801 # If a file in MANIFEST is missing, Configure asks if you want to
802 # continue (the default being 'n'). With stdin closed or /dev/null,
803 # it exits immediately and the check for config.sh below will skip.
804 exec './Configure', @ARGS;
805 die "Failed to start Configure: $!";
808 or die "wait for Configure, pid $pid failed: $!";
810 if ($target =~ /config\.s?h/) {
811 match_and_exit($target) if $match && -f $target;
812 report_and_exit(!-f $target, 'could build', 'could not build', $target);
813 } elsif (!-f 'config.sh') {
814 # Skip if something went wrong with Configure
816 skip('could not build config.sh');
819 # This is probably way too paranoid:
823 foreach my $file (@missing) {
824 my (undef, undef, $mode, undef, undef, undef, undef, $size)
826 if (!defined $mode) {
827 push @errors, "Added file $file has been deleted by Configure";
830 if (Fcntl::S_IMODE($mode) != 0) {
832 sprintf 'Added file %s had mode changed by Configure to %03o',
837 "Added file $file had sized changed by Configure to $size";
839 unlink $file or die "Can't unlink $file: $!";
841 foreach my $dir (@created_dirs) {
842 rmdir $dir or die "Can't rmdir $dir: $!";
848 # Correct makefile for newer GNU gcc
849 # Only really needed if you comment out the use of blead's makedepend.SH
852 local @ARGV = qw(makefile x2p/makefile);
854 print unless /<(?:built-in|command|stdin)/;
858 if ($major == 2 && extract_from_file('perl.c', qr/^ fclose\(e_fp\);$/)) {
859 # need to patch perl.c to avoid calling fclose() twice on e_fp when using -e
860 # This diff is part of commit ab821d7fdc14a438. The second close was
861 # introduced with perl-5.002, commit a5f75d667838e8e7
862 # Might want a6c477ed8d4864e6 too, for the corresponding change to pp_ctl.c
863 # (likely without this, eval will have "fun")
864 apply_patch(<<'EOPATCH');
865 diff --git a/perl.c b/perl.c
866 index 03c4d48..3c814a2 100644
869 @@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
870 #ifndef VMS /* VMS doesn't have environ array */
871 origenviron = environ;
873 + e_tmpname = Nullch;
877 @@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
879 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
880 croak("Can't write to temp file for -e: %s", Strerror(errno));
883 scriptname = e_tmpname;
885 @@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
886 curcop->cop_line = 0;
893 (void)UNLINK(e_tmpname);
894 + Safefree(e_tmpname);
895 + e_tmpname = Nullch;
898 /* now that script is parsed, we can modify record separator */
899 @@ -1369,7 +1371,7 @@ SV *sv;
903 - origfilename = savepv(e_fp ? "-e" : scriptname);
904 + origfilename = savepv(e_tmpname ? "-e" : scriptname);
905 curcop->cop_filegv = gv_fetchfile(origfilename);
906 if (strEQ(origfilename,"-"))
913 && extract_from_file('ext/DB_File/DB_File.xs',
914 qr!^#else /\* Berkeley DB Version > 2 \*/$!)
915 && !extract_from_file('ext/DB_File/DB_File.xs',
916 qr/^#ifdef AT_LEAST_DB_4_1$/)) {
917 # This line is changed by commit 3245f0580c13b3ab
918 my $line = extract_from_file('ext/DB_File/DB_File.xs',
919 qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/);
920 apply_patch(<<"EOPATCH");
921 diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
922 index 489ba96..fba8ded 100644
923 --- a/ext/DB_File/DB_File.xs
924 +++ b/ext/DB_File/DB_File.xs
925 \@\@ -183,4 +187,8 \@\@
928 +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
929 +# define AT_LEAST_DB_4_1
932 /* map version 2 features & constants onto their version 1 equivalent */
934 \@\@ -1334,7 +1419,12 \@\@ SV * sv ;
937 +#ifdef AT_LEAST_DB_4_1
938 + status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL, RETVAL->type,
944 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */
949 if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') {
950 edit_file('ext/IPC/SysV/SysV.xs', sub {
952 my $fixed = <<'EOFIX';
954 #include <sys/types.h>
955 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
957 # include <sys/ipc.h>
960 # include <sys/msg.h>
963 # if defined(PERL_SCO) || defined(PERL_ISC)
964 # include <sys/sysmacros.h> /* SHMLBA */
966 # include <sys/shm.h>
967 # ifndef HAS_SHMAT_PROTOTYPE
968 extern Shmat_t shmat (int, char *, int);
970 # if defined(HAS_SYSCONF) && defined(_SC_PAGESIZE)
971 # undef SHMLBA /* not static: determined at boot time */
972 # define SHMLBA sysconf(_SC_PAGESIZE)
973 # elif defined(HAS_GETPAGESIZE)
974 # undef SHMLBA /* not static: determined at boot time */
975 # define SHMLBA getpagesize()
981 #include <sys/types\.h>
983 (#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms;
988 # Parallel build for miniperl is safe
989 system "make $j miniperl </dev/null";
991 my $expected = $target =~ /^test/ ? 't/perl'
992 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
994 my $real_target = $target eq 'Fcntl' ? $expected : $target;
996 if ($target ne 'miniperl') {
997 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
998 $j = '' if $major < 10;
1000 if ($real_target eq 'test_prep') {
1002 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
1003 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
1004 # earlier than that, just make test. It will be fast enough.
1005 $real_target = extract_from_file('Makefile.SH',
1006 qr/^(test[-_]prep):/,
1011 system "make $j $real_target </dev/null";
1014 my $missing_target = $expected =~ /perl$/ ? !-x $expected : !-r $expected;
1016 if ($options{'test-build'}) {
1017 report_and_exit($missing_target, 'could build', 'could not build',
1019 } elsif ($missing_target) {
1020 skip("could not build $real_target");
1023 match_and_exit($real_target) if $match;
1025 if (defined $options{'one-liner'}) {
1026 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
1027 unshift @ARGV, "./$exe", '-Ilib', '-e', $options{'one-liner'};
1030 # This is what we came here to run:
1031 my $ret = system @ARGV;
1033 report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV");
1036 # cperl-indent-level: 4
1037 # indent-tabs-mode: nil
1040 # ex: set ts=8 sts=4 sw=4 et: