This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Add 'Fcntl' as a target for bisect-runner.pl.
[perl5.git] / Porting / bisect-runner.pl
CommitLineData
6a8dbfd7
NC
1#!/usr/bin/perl -w
2use strict;
3
390a69a9 4use Getopt::Long qw(:config bundling no_auto_abbrev);
77ae6092 5use Pod::Usage;
2526f4b8 6use Config;
6a8dbfd7 7
2526f4b8
NC
8my @targets
9 = qw(config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep);
6a8dbfd7 10
e4516dd0
NC
11my $cpus;
12if (open my $fh, '<', '/proc/cpuinfo') {
13 while (<$fh>) {
14 ++$cpus if /^processor\s+:\s+\d+$/;
15 }
d64af352
NC
16} elsif (-x '/sbin/sysctl') {
17 $cpus = 1 + $1 if `/sbin/sysctl hw.ncpu` =~ /^hw\.ncpu: (\d+)$/;
e4516dd0
NC
18}
19
f4800c99
NC
20my %options =
21 (
e4516dd0 22 jobs => defined $cpus ? $cpus + 1 : 2,
f4800c99
NC
23 'expect-pass' => 1,
24 clean => 1, # mostly for debugging this
25 );
6a8dbfd7 26
390a69a9
NC
27my @paths = qw(/usr/local/lib64 /lib64 /usr/lib64);
28
29my %defines =
30 (
31 usedevel => '',
32 optimize => '-g',
33 cc => 'ccache gcc',
34 ld => 'gcc',
e4516dd0 35 (`uname -sm` eq "Linux x86_64\n" ? (libpth => \@paths) : ()),
390a69a9
NC
36 );
37
f4800c99
NC
38unless(GetOptions(\%options,
39 'target=s', 'jobs|j=i', 'expect-pass=i',
40 'expect-fail' => sub { $options{'expect-pass'} = 0; },
41 'clean!', 'one-liner|e=s', 'match=s', 'force-manifest',
77ae6092 42 'test-build', 'check-args', 'A=s@', 'usage|help|?',
390a69a9
NC
43 'D=s@' => sub {
44 my (undef, $val) = @_;
45 if ($val =~ /\A([^=]+)=(.*)/s) {
46 $defines{$1} = length $2 ? $2 : "\0";
47 } else {
48 $defines{$val} = '';
49 }
50 },
51 'U=s@' => sub {
52 $defines{$_[1]} = undef;
53 },
6a8dbfd7 54 )) {
77ae6092 55 pod2usage(exitval => 255, verbose => 1);
6a8dbfd7
NC
56}
57
f4800c99 58my ($target, $j, $match) = @options{qw(target jobs match)};
e295b7be 59
77ae6092
NC
60pod2usage(exitval => 255, verbose => 1) if $options{usage};
61pod2usage(exitval => 255, verbose => 1)
62 unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
6a8dbfd7 63
f4800c99 64exit 0 if $options{'check-args'};
6a8dbfd7 65
77ae6092
NC
66=head1 NAME
67
68bisect.pl - use git bisect to pinpoint changes
69
70=head1 SYNOPSIS
71
72 # When did this become an error?
73 .../Porting/bisect.pl -e 'my $a := 2;'
71d80638 74 # When did this stop being an error?
77ae6092
NC
75 .../Porting/bisect.pl --expect-fail -e '1 // 2'
76 # When did this stop matching?
77 .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
78 # When did this start matching?
79 .../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
80 # When did this test program stop working?
81 .../Porting/bisect.pl --target=perl -- ./perl -Ilib test_prog.pl
82 # When did this first become valid syntax?
83 .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
84 --expect-fail -e 'my $a := 2;'
85 # What was the last revision to build with these options?
86 .../Porting/bisect.pl --test-build -Dd_dosuid
87
88=head1 DESCRIPTION
89
90Together C<bisect.pl> and C<bisect-runner.pl> attempt to automate the use
91of C<git bisect> as much as possible. With one command (and no other files)
92it's easy to find out
93
94=over 4
95
96=item *
97
98Which commit caused this example code to break?
99
100=item *
101
102Which commit caused this example code to start working?
103
104=item *
105
106Which commit added the first to match this regex?
107
108=item *
109
110Which commit removed the last to match this regex?
111
112=back
113
114usually without needing to know which versions of perl to use as start and
115end revisions.
116
117By default C<bisect.pl> will process all options, then use the rest of the
118command line as arguments to list C<system> to run a test case. By default,
119the test case should pass (exit with 0) on earlier perls, and fail (exit
120non-zero) on I<blead>. C<bisect.pl> will use C<bisect-runner.pl> to find the
121earliest stable perl version on which the test case passes, check that it
122fails on blead, and then use C<bisect-runner.pl> with C<git bisect run> to
123find the commit which caused the failure.
124
125Because the test case is the complete argument to C<system>, it is easy to
126run something other than the F<perl> built, if necessary. If you need to run
127the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>
128
129=head1 OPTIONS
130
131=over 4
132
133=item *
134
135--start I<commit-ish>
136
137Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
71d80638 138else C<git> understands as a revision). If not specified, C<bisect.pl> will
77ae6092
NC
139search stable perl releases from 5.002 to 5.14.0 until it finds one where
140the test case passes.
141
142=item *
143
144--end I<commit-ish>
145
146Most recent revision to test, as a I<commit-ish>. If not specified, defaults
147to I<blead>
148
149=item *
150
151--target I<target>
152
153F<Makefile> target (or equivalent) needed, to run the test case. If specified,
154this should be one of
155
156=over 4
157
158=item *
159
160I<config.sh>
161
162Just run C<Configure>
163
164=item *
165
166I<config.h>
167
168Run the various F<*.SH> files to generate F<Makefile>, F<config.h>, I<etc>.
169
170=item *
171
172I<miniperl>
173
174Build F<miniperl>.
175
176=item *
177
178I<lib/Config.pm>
179
180Use F<miniperl> to build F<lib/Config.pm>
181
182=item *
183
2526f4b8
NC
184I<Fcntl>
185
186Build F<lib/auto/Fcntl/Fnctl.so> (strictly, C<.$Config{so}>). As L<Fcntl>
187is simple XS module present since 5.000, this provides a fast test of
188whether XS modules can be build. Note, XS modules are built by F<miniperl>,
189hence this target will not build F<perl>.
190
191=item *
192
77ae6092
NC
193I<perl>
194
195Build F<perl>. This also builds pure-Perl modules in F<cpan>, F<dist> and
2526f4b8
NC
196F<ext>. XS modules (such as L<Fcntl>) are not built.
197
198=item *
199
200I<perl>
77ae6092
NC
201
202=item *
203
204I<test_prep>
205
206Build everything needed to run the tests. This is the default if we're
207running test code, but is time consuming, as it means building all
208C<XS> modules. For older F<Makefile>s, the previous name of C<test-prep>
209is automatically substituted. For very old F<Makefile>s, C<make test> is
210run, as there is no target provided to just get things ready, and for 5.004
211and earlier the tests run very quickly.
212
213=back
214
215=item *
216
217--one-liner 'code to run'
218
219=item *
220
221-e 'code to run'
222
223Example code to run, just like you'd use with C<perl -e>.
224
225This prepends C<./perl -Ilib -e 'code to run'> to the test case given,
226or C<./miniperl> if I<target> is C<miniperl>
227
228(Usually you'll use C<-e> instead of providing a test case in the
229non-option arguments to C<bisect.pl>)
230
231C<-E> intentionally isn't supported, as it's an error in 5.8.0 and earlier,
232which interferes with detecting errors in the example code itself.
233
234=item *
235
236--expect-fail
237
238The test case should fail for the I<start> revision, and pass for the I<end>
239revision. The bisect run will find the first commit where it passes.
240
241=item *
242
243-Dusethreads
244
245=item *
246
247-Uusedevel
248
249=item *
250
251-Accflags=-DNO_MATHOMS
252
253Arguments to pass to F<Configure>. Repeated C<-A> arguments are passed
254through as is. C<-D> and C<-U> are processed in order, and override
255previous settings for the same parameter.
256
257=item *
258
259--jobs
260
261=item *
262
263-j
264
e4516dd0 265Number of C<make> jobs to run in parallel. If F</proc/cpuinfo> exists and can
d64af352
NC
266be parsed, or F</sbin/sysctl> exists and reports <hw.ncpu>, defaults to
2671 + I<number of CPUs>. Otherwise defaults to 2.
77ae6092
NC
268
269=item *
270
271--match
272
273Instead of running a test program to determine I<pass> or I<fail>, pass
274if the given regex matches, and hence search for the commit that removes
275the last matching file.
276
277If no I<target> is specified, the match is against all files in the
278repository (which is fast). If a I<target> is specified, that target is
279built, and the match is against only the built files. C<--expect-fail> can
280be used with C<--match> to search for a commit that adds files that match.
281
282=item *
283
284--test-build
285
286Test that the build completes, without running any test case.
287
288By default, if the build for the desired I<target> fails to complete,
289F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
290being that one wants to find a commit which changed state "builds && passes"
291to "builds && fails". If instead one is interested in which commit broke the
292build (possibly for particular F<Configure> options), use I<--test-build>
293to treat a build failure as a failure, not a "skip".
294
295=item *
296
297By default, a build will "skip" if any files listed in F<MANIFEST> are not
298present. Usually this is useful, as it avoids false-failures. However, there
299are some long ranges of commits where listed files are missing, which can
300cause a bisect to abort because all that remain are skipped revisions.
301
302In these cases, particularly if the test case uses F<miniperl> and no modules,
303it may be more useful to force the build to continue, even if files
304F<MANIFEST> are missing.
305
306=item *
307
308--expect-pass [0|1]
309
310C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
311
312=item *
313
314--no-clean
315
316Tell F<bisect-runner.pl> not to clean up after the build. This allows one
317to use F<bisect-runner.pl> to build the current particular perl revision for
318interactive testing, or for debugging F<bisect-runner.pl>.
319
320Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
321
322=item *
323
324--check-args
325
326Validate the options and arguments, and exit silently if they are valid.
327
328=item *
329
330--usage
331
332=item *
333
334--help
335
336=item *
337
338-?
339
340Display the usage information and exit.
341
342=back
343
344=cut
345
0afef97d 346die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
6a8dbfd7
NC
347
348$j = "-j$j" if $j =~ /\A\d+\z/;
349
0142f0ce
NC
350# Sadly, however hard we try, I don't think that it will be possible to build
351# modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
352# which updated to MakeMaker 3.7, which changed from using a hard coded ld
353# in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
354
6a8dbfd7
NC
355sub extract_from_file {
356 my ($file, $rx, $default) = @_;
357 open my $fh, '<', $file or die "Can't open $file: $!";
358 while (<$fh>) {
359 my @got = $_ =~ $rx;
360 return wantarray ? @got : $got[0]
361 if @got;
362 }
363 return $default if defined $default;
364 return;
365}
366
ab4a15f9 367sub clean {
f4800c99 368 if ($options{clean}) {
ab4a15f9
NC
369 # Needed, because files that are build products in this checked out
370 # version might be in git in the next desired version.
371 system 'git clean -dxf';
372 # Needed, because at some revisions the build alters checked out files.
373 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
374 system 'git reset --hard HEAD';
375 }
376}
377
378sub skip {
379 my $reason = shift;
380 clean();
381 warn "skipping - $reason";
382 exit 125;
383}
384
f1050811
NC
385sub report_and_exit {
386 my ($ret, $pass, $fail, $desc) = @_;
387
388 clean();
389
f4800c99 390 my $got = ($options{'expect-pass'} ? !$ret : $ret) ? 'good' : 'bad';
f1050811
NC
391 if ($ret) {
392 print "$got - $fail $desc\n";
393 } else {
394 print "$got - $pass $desc\n";
395 }
396
397 exit($got eq 'bad');
398}
399
0afef97d
NC
400sub match_and_exit {
401 my $target = shift;
402 my $matches = 0;
403 my $re = qr/$match/;
404 my @files;
405
406 {
407 local $/ = "\0";
408 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
409 chomp @files;
410 }
411
412 foreach my $file (@files) {
413 open my $fh, '<', $file or die "Can't open $file: $!";
414 while (<$fh>) {
415 if ($_ =~ $re) {
416 ++$matches;
417 if (tr/\t\r\n -~\200-\377//c) {
418 print "Binary file $file matches\n";
419 } else {
420 $_ .= "\n" unless /\n\z/;
421 print "$file: $_";
422 }
423 }
424 }
425 close $fh or die "Can't close $file: $!";
426 }
427 report_and_exit(!$matches,
428 $matches == 1 ? '1 match for' : "$matches matches for",
429 'no matches for', $match);
430}
431
0142f0ce
NC
432sub apply_patch {
433 my $patch = shift;
434
f1193e4b 435 my ($file) = $patch =~ qr!^diff.*a/(\S+) b/\1!;
eb315236 436 open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
0142f0ce 437 print $fh $patch;
f1193e4b 438 close $fh or die "Can't patch $file: $?, $!";
0142f0ce
NC
439}
440
6a8dbfd7
NC
441# Not going to assume that system perl is yet new enough to have autodie
442system 'git clean -dxf' and die;
443
0afef97d
NC
444if (!defined $target) {
445 match_and_exit() if $match;
446 $target = 'test_prep';
bc96a05a
NC
447}
448
4b081584
NC
449skip('no Configure - is this the //depot/perlext/Compiler branch?')
450 unless -f 'Configure';
451
dbcdc176
NC
452# This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
453my $major
454 = extract_from_file('patchlevel.h',
455 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
456 0);
457
0142f0ce
NC
458if ($major < 1) {
459 if (extract_from_file('Configure',
460 qr/^ \*=\*\) echo "\$1" >> \$optdef;;$/)) {
461 # This is " Spaces now allowed in -D command line options.",
462 # part of commit ecfc54246c2a6f42
463 apply_patch(<<'EOPATCH');
464diff --git a/Configure b/Configure
465index 3d3b38d..78ffe16 100755
466--- a/Configure
467+++ b/Configure
468@@ -652,7 +777,8 @@ while test $# -gt 0; do
469 echo "$me: use '-U symbol=', not '-D symbol='." >&2
470 echo "$me: ignoring -D $1" >&2
471 ;;
472- *=*) echo "$1" >> $optdef;;
473+ *=*) echo "$1" | \
474+ sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
475 *) echo "$1='define'" >> $optdef;;
476 esac
477 shift
478EOPATCH
479 }
480 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
481 # Configure's original simple "grep" for d_namlen falls foul of the
482 # approach taken by the glibc headers:
483 # #ifdef _DIRENT_HAVE_D_NAMLEN
484 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
485 #
486 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
487 # This is also part of commit ecfc54246c2a6f42
488 apply_patch(<<'EOPATCH');
489diff --git a/Configure b/Configure
490index 3d3b38d..78ffe16 100755
491--- a/Configure
492+++ b/Configure
493@@ -3935,7 +4045,8 @@ $rm -f try.c
494
495 : see if the directory entry stores field length
496 echo " "
497-if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
498+$cppstdin $cppflags $cppminus < "$xinc" > try.c
499+if $contains 'd_namlen' try.c >/dev/null 2>&1; then
500 echo "Good, your directory entry keeps length information in d_namlen." >&4
501 val="$define"
502 else
503EOPATCH
504 }
505}
d90ae42b
NC
506
507if ($major < 10 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
508 # This is commit 01d07975f7ef0e7d, trimmed:
509 apply_patch(<<'EOPATCH');
510diff --git a/Configure b/Configure
511index 3d2e8b9..6ce7766 100755
512--- a/Configure
513+++ b/Configure
514@@ -6743,5 +6743,22 @@ set d_dosuid
515
516 : see if this is a malloc.h system
517-set malloc.h i_malloc
518-eval $inhdr
519+: we want a real compile instead of Inhdr because some systems have a
520+: malloc.h that just gives a compile error saying to use stdlib.h instead
521+echo " "
522+$cat >try.c <<EOCP
523+#include <stdlib.h>
524+#include <malloc.h>
525+int main () { return 0; }
526+EOCP
527+set try
528+if eval $compile; then
529+ echo "<malloc.h> found." >&4
530+ val="$define"
531+else
532+ echo "<malloc.h> NOT found." >&4
533+ val="$undef"
534+fi
535+$rm -f try.c try
536+set i_malloc
537+eval $setvar
538
539EOPATCH
540}
0142f0ce 541
6a8dbfd7
NC
542# There was a bug in makedepend.SH which was fixed in version 96a8704c.
543# Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
544# Remove this if you're actually bisecting a problem related to makedepend.SH
545system 'git show blead:makedepend.SH > makedepend.SH' and die;
546
d64af352
NC
547if ($^O eq 'freebsd') {
548 # There are rather too many version-specific FreeBSD hints fixes to patch
549 # individually. Also, more than once the FreeBSD hints file has been
550 # written in what turned out to be a rather non-future-proof style,
551 # with case statements treating the most recent version as the exception,
552 # instead of treating previous versions' behaviour explicitly and changing
553 # the default to cater for the current behaviour. (As strangely, future
554 # versions inherit the current behaviour.)
555 system 'git show blead:hints/freebsd.sh > hints/freebsd.sh' and die;
556}
557
6a8dbfd7
NC
558# if Encode is not needed for the test, you can speed up the bisect by
559# excluding it from the runs with -Dnoextensions=Encode
560# ccache is an easy win. Remove it if it causes problems.
6a8dbfd7
NC
561# Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
562# to true in hints/linux.sh
563# On dromedary, from that point on, Configure (by default) fails to find any
564# libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
565# versioned libraries. Without -lm, the build fails.
566# Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
567# until commit faae14e6e968e1c0 adds it to the hints.
568# However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
569# because it will spot versioned libraries, pass them to the compiler, and then
570# bail out pretty early on. Configure won't let us override libswanted, but it
571# will let us override the entire libs list.
572
573unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
574 # Before 1cfa4ec74d4933da, so force the libs list.
575
576 my @libs;
577 # This is the current libswanted list from Configure, less the libs removed
578 # by current hints/linux.sh
579 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld
580 ld sun m crypt sec util c cposix posix ucb BSD)) {
581 foreach my $dir (@paths) {
582 next unless -f "$dir/lib$lib.so";
583 push @libs, "-l$lib";
584 last;
585 }
586 }
390a69a9 587 $defines{libs} = \@libs unless exists $defines{libs};
6a8dbfd7
NC
588}
589
4b081584
NC
590# This seems to be necessary to avoid makedepend becoming confused, and hanging
591# on stdin. Seems that the code after make shlist || ...here... is never run.
390a69a9
NC
592$defines{trnl} = q{'\n'}
593 if $major < 4 && !exists $defines{trnl};
4b081584 594
390a69a9
NC
595$defines{usenm} = undef
596 if $major < 2 && !exists $defines{usenm};
0142f0ce 597
67382a3b
NC
598my (@missing, @created_dirs);
599
f4800c99 600if ($options{'force-manifest'}) {
67382a3b
NC
601 open my $fh, '<', 'MANIFEST'
602 or die "Could not open MANIFEST: $!";
603 while (<$fh>) {
604 next unless /^(\S+)/;
605 push @missing, $1
606 unless -f $1;
607 }
608 close $fh or die "Can't close MANIFEST: $!";
609
610 foreach my $pathname (@missing) {
611 my @parts = split '/', $pathname;
612 my $leaf = pop @parts;
613 my $path = '.';
614 while (@parts) {
615 $path .= '/' . shift @parts;
616 next if -d $path;
617 mkdir $path, 0700 or die "Can't create $path: $!";
618 unshift @created_dirs, $path;
619 }
620 open $fh, '>', $pathname or die "Can't open $pathname: $!";
621 close $fh or die "Can't close $pathname: $!";
622 chmod 0, $pathname or die "Can't chmod 0 $pathname: $!";
623 }
624}
625
dd4e46d7 626my @ARGS = $target eq 'config.sh' ? '-dEs' : '-des';
390a69a9
NC
627foreach my $key (sort keys %defines) {
628 my $val = $defines{$key};
629 if (ref $val) {
630 push @ARGS, "-D$key=@$val";
631 } elsif (!defined $val) {
632 push @ARGS, "-U$key";
633 } elsif (!length $val) {
634 push @ARGS, "-D$key";
635 } else {
636 $val = "" if $val eq "\0";
637 push @ARGS, "-D$key=$val";
638 }
639}
640push @ARGS, map {"-A$_"} @{$options{A}};
641
6a8dbfd7
NC
642# </dev/null because it seems that some earlier versions of Configure can
643# call commands in a way that now has them reading from stdin (and hanging)
644my $pid = fork;
645die "Can't fork: $!" unless defined $pid;
646if (!$pid) {
dbcdc176
NC
647 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was not a
648 # tty. With that commit, the tty requirement was dropped for -de and -dE
8754c3bb 649 if($major > 4) {
67382a3b 650 open STDIN, '<', '/dev/null';
f4800c99 651 } elsif (!$options{'force-manifest'}) {
8754c3bb
NC
652 # If a file in MANIFEST is missing, Configure asks if you want to
653 # continue (the default being 'n'). With stdin closed or /dev/null,
654 # it exit immediately and the check for config.sh below will skip.
655 # To avoid a hang, we need to check MANIFEST for ourselves, and skip
656 # if anything is missing.
657 open my $fh, '<', 'MANIFEST';
658 skip("Could not open MANIFEST: $!")
659 unless $fh;
660 while (<$fh>) {
661 next unless /^(\S+)/;
662 skip("$1 from MANIFEST doesn't exist")
663 unless -f $1;
664 }
665 close $fh or die "Can't close MANIFEST: $!";
666 }
6a8dbfd7
NC
667 exec './Configure', @ARGS;
668 die "Failed to start Configure: $!";
669}
670waitpid $pid, 0
671 or die "wait for Configure, pid $pid failed: $!";
672
0afef97d
NC
673if ($target =~ /config\.s?h/) {
674 match_and_exit($target) if $match && -f $target;
dd4e46d7
NC
675 report_and_exit(!-f $target, 'could build', 'could not build', $target);
676} elsif (!-f 'config.sh') {
677 # Skip if something went wrong with Configure
678
679 skip('could not build config.sh');
680}
6a8dbfd7 681
67382a3b
NC
682# This is probably way too paranoid:
683if (@missing) {
684 my @errors;
eb4906f4 685 require Fcntl;
67382a3b
NC
686 foreach my $file (@missing) {
687 my (undef, undef, $mode, undef, undef, undef, undef, $size)
688 = stat $file;
689 if (!defined $mode) {
690 push @errors, "Added file $file has been deleted by Configure";
691 next;
692 }
eb4906f4 693 if (Fcntl::S_IMODE($mode) != 0) {
67382a3b
NC
694 push @errors,
695 sprintf 'Added file %s had mode changed by Configure to %03o',
696 $file, $mode;
697 }
698 if ($size != 0) {
699 push @errors,
700 "Added file $file had sized changed by Configure to $size";
701 }
702 unlink $file or die "Can't unlink $file: $!";
703 }
704 foreach my $dir (@created_dirs) {
705 rmdir $dir or die "Can't rmdir $dir: $!";
706 }
6c0925a0
NC
707 skip("@errors")
708 if @errors;
67382a3b
NC
709}
710
6a8dbfd7
NC
711# Correct makefile for newer GNU gcc
712# Only really needed if you comment out the use of blead's makedepend.SH
713{
714 local $^I = "";
715 local @ARGV = qw(makefile x2p/makefile);
716 while (<>) {
717 print unless /<(?:built-in|command|stdin)/;
718 }
719}
6a8dbfd7 720
0142f0ce
NC
721if ($major == 2 && extract_from_file('perl.c', qr/^ fclose\(e_fp\);$/)) {
722 # need to patch perl.c to avoid calling fclose() twice on e_fp when using -e
723 # This diff is part of commit ab821d7fdc14a438. The second close was
724 # introduced with perl-5.002, commit a5f75d667838e8e7
725 # Might want a6c477ed8d4864e6 too, for the corresponding change to pp_ctl.c
726 # (likely without this, eval will have "fun")
727 apply_patch(<<'EOPATCH');
728diff --git a/perl.c b/perl.c
729index 03c4d48..3c814a2 100644
730--- a/perl.c
731+++ b/perl.c
732@@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
733 #ifndef VMS /* VMS doesn't have environ array */
734 origenviron = environ;
735 #endif
736+ e_tmpname = Nullch;
737
738 if (do_undump) {
739
740@@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
741 if (e_fp) {
742 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
743 croak("Can't write to temp file for -e: %s", Strerror(errno));
744+ e_fp = Nullfp;
745 argc++,argv--;
746 scriptname = e_tmpname;
747 }
748@@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
749 curcop->cop_line = 0;
750 curstash = defstash;
751 preprocess = FALSE;
752- if (e_fp) {
753- fclose(e_fp);
754- e_fp = Nullfp;
755+ if (e_tmpname) {
756 (void)UNLINK(e_tmpname);
757+ Safefree(e_tmpname);
758+ e_tmpname = Nullch;
759 }
760
761 /* now that script is parsed, we can modify record separator */
762@@ -1369,7 +1371,7 @@ SV *sv;
763 scriptname = xfound;
764 }
765
766- origfilename = savepv(e_fp ? "-e" : scriptname);
767+ origfilename = savepv(e_tmpname ? "-e" : scriptname);
768 curcop->cop_filegv = gv_fetchfile(origfilename);
769 if (strEQ(origfilename,"-"))
770 scriptname = "";
771
772EOPATCH
773}
774
9a999a97
NC
775# Parallel build for miniperl is safe
776system "make $j miniperl";
777
2526f4b8
NC
778my $expected = $target =~ /^test/ ? 't/perl'
779 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
780 : $target;
781my $real_target = $target eq 'Fcntl' ? $expected : $target;
782
9a999a97
NC
783if ($target ne 'miniperl') {
784 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
372ba1f9 785 $j = '' if $major < 10;
9a999a97 786
2526f4b8 787 if ($real_target eq 'test_prep') {
9a999a97
NC
788 if ($major < 8) {
789 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
790 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
791 # earlier than that, just make test. It will be fast enough.
2526f4b8
NC
792 $real_target = extract_from_file('Makefile.SH',
793 qr/^(test[-_]prep):/,
794 'test');
9a999a97 795 }
6a8dbfd7 796 }
6a8dbfd7 797
eb315236
NC
798 if ($major < 10
799 and -f 'ext/IPC/SysV/SysV.xs',
800 and my ($line) = extract_from_file('ext/IPC/SysV/SysV.xs',
801 qr!^(# *include <asm/page.h>)$!)) {
802 apply_patch(<<"EOPATCH");
803diff --git a/ext/IPC/SysV/SysV.xs b/ext/IPC/SysV/SysV.xs
804index 35a8fde..62a7965 100644
805--- a/ext/IPC/SysV/SysV.xs
806+++ b/ext/IPC/SysV/SysV.xs
807\@\@ -4,7 +4,6 \@\@
808
809 #include <sys/types.h>
810 #ifdef __linux__
811-$line
812 #endif
813 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
814 #ifndef HAS_SEM
815EOPATCH
816 }
2526f4b8 817 system "make $j $real_target";
9a999a97 818}
6a8dbfd7 819
67382a3b
NC
820my $missing_target = $expected =~ /perl$/ ? !-x $expected : !-r $expected;
821
f4800c99 822if ($options{'test-build'}) {
2526f4b8
NC
823 report_and_exit($missing_target, 'could build', 'could not build',
824 $real_target);
67382a3b 825} elsif ($missing_target) {
2526f4b8 826 skip("could not build $real_target");
67382a3b 827}
6a8dbfd7 828
2526f4b8 829match_and_exit($real_target) if $match;
0afef97d
NC
830
831if (defined $options{'one-liner'}) {
2526f4b8 832 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
0afef97d
NC
833 unshift @ARGV, "./$exe", '-Ilib', '-e', $options{'one-liner'};
834}
835
6a8dbfd7
NC
836# This is what we came here to run:
837my $ret = system @ARGV;
838
f1050811 839report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV");
9a999a97
NC
840
841# Local variables:
842# cperl-indent-level: 4
843# indent-tabs-mode: nil
844# End:
845#
846# ex: set ts=8 sts=4 sw=4 et: