This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
bisect-runner.pl now builds test_prep on OS X back to 5.001n
[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+)$/;
da83cd31
NC
18} elsif (-x '/usr/bin/getconf') {
19 $cpus = 1 + $1 if `/usr/bin/getconf _NPROCESSORS_ONLN` =~ /^(\d+)$/;
e4516dd0
NC
20}
21
f4800c99
NC
22my %options =
23 (
e4516dd0 24 jobs => defined $cpus ? $cpus + 1 : 2,
f4800c99
NC
25 'expect-pass' => 1,
26 clean => 1, # mostly for debugging this
27 );
6a8dbfd7 28
fdbac266
NC
29my $linux64 = `uname -sm` eq "Linux x86_64\n" ? '64' : '';
30
599ee4f7
NC
31my @paths;
32
33if ($^O eq 'linux') {
34 # This is the search logic for a multi-arch library layout
35 # added to linux.sh in commits 40f026236b9959b7 and dcffd848632af2c7.
36 my $gcc = -x '/usr/bin/gcc' ? '/usr/bin/gcc' : 'gcc';
37
38 foreach (`$gcc -print-search-dirs`) {
39 next unless /^libraries: =(.*)/;
40 foreach (split ':', $1) {
41 next if m/gcc/;
42 next unless -d $_;
43 s!/$!!;
44 push @paths, $_;
45 }
46 }
47}
48
49push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib);
390a69a9
NC
50
51my %defines =
52 (
53 usedevel => '',
54 optimize => '-g',
55 cc => 'ccache gcc',
56 ld => 'gcc',
fdbac266 57 ($linux64 ? (libpth => \@paths) : ()),
390a69a9
NC
58 );
59
f4800c99
NC
60unless(GetOptions(\%options,
61 'target=s', 'jobs|j=i', 'expect-pass=i',
62 'expect-fail' => sub { $options{'expect-pass'} = 0; },
63 'clean!', 'one-liner|e=s', 'match=s', 'force-manifest',
77ae6092 64 'test-build', 'check-args', 'A=s@', 'usage|help|?',
390a69a9
NC
65 'D=s@' => sub {
66 my (undef, $val) = @_;
67 if ($val =~ /\A([^=]+)=(.*)/s) {
68 $defines{$1} = length $2 ? $2 : "\0";
69 } else {
70 $defines{$val} = '';
71 }
72 },
73 'U=s@' => sub {
74 $defines{$_[1]} = undef;
75 },
6a8dbfd7 76 )) {
77ae6092 77 pod2usage(exitval => 255, verbose => 1);
6a8dbfd7
NC
78}
79
f4800c99 80my ($target, $j, $match) = @options{qw(target jobs match)};
e295b7be 81
77ae6092
NC
82pod2usage(exitval => 255, verbose => 1) if $options{usage};
83pod2usage(exitval => 255, verbose => 1)
84 unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
6a8dbfd7 85
f4800c99 86exit 0 if $options{'check-args'};
6a8dbfd7 87
77ae6092
NC
88=head1 NAME
89
90bisect.pl - use git bisect to pinpoint changes
91
92=head1 SYNOPSIS
93
94 # When did this become an error?
95 .../Porting/bisect.pl -e 'my $a := 2;'
71d80638 96 # When did this stop being an error?
77ae6092
NC
97 .../Porting/bisect.pl --expect-fail -e '1 // 2'
98 # When did this stop matching?
99 .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
100 # When did this start matching?
101 .../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
102 # When did this test program stop working?
facd1b88 103 .../Porting/bisect.pl -- ./perl -Ilib test_prog.pl
77ae6092
NC
104 # When did this first become valid syntax?
105 .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
106 --expect-fail -e 'my $a := 2;'
107 # What was the last revision to build with these options?
108 .../Porting/bisect.pl --test-build -Dd_dosuid
109
110=head1 DESCRIPTION
111
facd1b88 112Together F<bisect.pl> and F<bisect-runner.pl> attempt to automate the use
77ae6092
NC
113of C<git bisect> as much as possible. With one command (and no other files)
114it's easy to find out
115
116=over 4
117
118=item *
119
120Which commit caused this example code to break?
121
122=item *
123
124Which commit caused this example code to start working?
125
126=item *
127
128Which commit added the first to match this regex?
129
130=item *
131
132Which commit removed the last to match this regex?
133
134=back
135
136usually without needing to know which versions of perl to use as start and
137end revisions.
138
facd1b88 139By default F<bisect.pl> will process all options, then use the rest of the
77ae6092
NC
140command line as arguments to list C<system> to run a test case. By default,
141the test case should pass (exit with 0) on earlier perls, and fail (exit
facd1b88 142non-zero) on I<blead>. F<bisect.pl> will use F<bisect-runner.pl> to find the
77ae6092 143earliest stable perl version on which the test case passes, check that it
facd1b88 144fails on blead, and then use F<bisect-runner.pl> with C<git bisect run> to
77ae6092
NC
145find the commit which caused the failure.
146
147Because the test case is the complete argument to C<system>, it is easy to
148run something other than the F<perl> built, if necessary. If you need to run
149the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>
150
5842706e
NC
151You need a clean checkout to run a bisect, and you can't use the checkout
152which contains F<Porting/bisect.pl> (because C<git bisect>) will check out
153a revision before F<Porting/bisect-runner.pl> was added, which
154C<git bisect run> needs). If your working checkout is called F<perl>, the
155simplest solution is to make a local clone, and run from that. I<i.e.>:
156
157 cd ..
158 git clone perl perl2
159 cd perl2
160 ../perl/Porting/bisect.pl ...
161
facd1b88 162By default, F<bisect-runner.pl> will automatically disable the build of
cfadff5f
NC
163L<DB_File> for commits earlier than ccb44e3bf3be2c30, as it's not practical
164to patch DB_File 1.70 and earlier to build with current Berkeley DB headers.
165(ccb44e3bf3be2c30 was in September 1999, between 5.005_62 and 5.005_63.)
166If your F<db.h> is old enough you can override this with C<-Unoextensions>.
167
77ae6092
NC
168=head1 OPTIONS
169
170=over 4
171
172=item *
173
174--start I<commit-ish>
175
176Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
facd1b88 177else C<git> understands as a revision). If not specified, F<bisect.pl> will
77ae6092
NC
178search stable perl releases from 5.002 to 5.14.0 until it finds one where
179the test case passes.
180
181=item *
182
183--end I<commit-ish>
184
185Most recent revision to test, as a I<commit-ish>. If not specified, defaults
b4f0ec5f 186to I<blead>.
77ae6092
NC
187
188=item *
189
190--target I<target>
191
192F<Makefile> target (or equivalent) needed, to run the test case. If specified,
193this should be one of
194
195=over 4
196
197=item *
198
199I<config.sh>
200
facd1b88 201Just run F<./Configure>
77ae6092
NC
202
203=item *
204
205I<config.h>
206
207Run the various F<*.SH> files to generate F<Makefile>, F<config.h>, I<etc>.
208
209=item *
210
211I<miniperl>
212
213Build F<miniperl>.
214
215=item *
216
217I<lib/Config.pm>
218
219Use F<miniperl> to build F<lib/Config.pm>
220
221=item *
222
2526f4b8
NC
223I<Fcntl>
224
225Build F<lib/auto/Fcntl/Fnctl.so> (strictly, C<.$Config{so}>). As L<Fcntl>
226is simple XS module present since 5.000, this provides a fast test of
b4f0ec5f 227whether XS modules can be built. Note, XS modules are built by F<miniperl>,
2526f4b8
NC
228hence this target will not build F<perl>.
229
230=item *
231
77ae6092
NC
232I<perl>
233
234Build F<perl>. This also builds pure-Perl modules in F<cpan>, F<dist> and
2526f4b8
NC
235F<ext>. XS modules (such as L<Fcntl>) are not built.
236
237=item *
238
77ae6092
NC
239I<test_prep>
240
241Build everything needed to run the tests. This is the default if we're
242running test code, but is time consuming, as it means building all
b4f0ec5f 243XS modules. For older F<Makefile>s, the previous name of C<test-prep>
77ae6092
NC
244is automatically substituted. For very old F<Makefile>s, C<make test> is
245run, as there is no target provided to just get things ready, and for 5.004
246and earlier the tests run very quickly.
247
248=back
249
250=item *
251
252--one-liner 'code to run'
253
254=item *
255
256-e 'code to run'
257
a1756669 258Example code to run, just like you'd use with C<perl -e>.
77ae6092
NC
259
260This prepends C<./perl -Ilib -e 'code to run'> to the test case given,
facd1b88 261or F<./miniperl> if I<target> is C<miniperl>.
77ae6092
NC
262
263(Usually you'll use C<-e> instead of providing a test case in the
facd1b88 264non-option arguments to F<bisect.pl>)
77ae6092
NC
265
266C<-E> intentionally isn't supported, as it's an error in 5.8.0 and earlier,
267which interferes with detecting errors in the example code itself.
268
269=item *
270
271--expect-fail
272
273The test case should fail for the I<start> revision, and pass for the I<end>
274revision. The bisect run will find the first commit where it passes.
275
276=item *
277
af7c500f 278-Dnoextensions=Encode
77ae6092
NC
279
280=item *
281
282-Uusedevel
283
284=item *
285
286-Accflags=-DNO_MATHOMS
287
288Arguments to pass to F<Configure>. Repeated C<-A> arguments are passed
289through as is. C<-D> and C<-U> are processed in order, and override
af7c500f
NC
290previous settings for the same parameter. F<bisect-runner.pl> emulates
291C<-Dnoextensions> when F<Configure> itself does not provide it, as it's
292often very useful to be able to disable some XS extensions.
77ae6092
NC
293
294=item *
295
b4f0ec5f 296--jobs I<jobs>
77ae6092
NC
297
298=item *
299
b4f0ec5f 300-j I<jobs>
77ae6092 301
da83cd31
NC
302Number of C<make> jobs to run in parallel. If F</proc/cpuinfo> exists and
303can be parsed, or F</sbin/sysctl> exists and reports C<hw.ncpu>, or
304F</usr/bin/getconf> exists and reports C<_NPROCESSORS_ONLN> defaults to 1 +
305I<number of CPUs>. Otherwise defaults to 2.
77ae6092
NC
306
307=item *
308
b4f0ec5f 309--match pattern
77ae6092
NC
310
311Instead of running a test program to determine I<pass> or I<fail>, pass
312if the given regex matches, and hence search for the commit that removes
313the last matching file.
314
315If no I<target> is specified, the match is against all files in the
316repository (which is fast). If a I<target> is specified, that target is
317built, and the match is against only the built files. C<--expect-fail> can
318be used with C<--match> to search for a commit that adds files that match.
319
320=item *
321
322--test-build
323
324Test that the build completes, without running any test case.
325
326By default, if the build for the desired I<target> fails to complete,
327F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
328being that one wants to find a commit which changed state "builds && passes"
329to "builds && fails". If instead one is interested in which commit broke the
330build (possibly for particular F<Configure> options), use I<--test-build>
331to treat a build failure as a failure, not a "skip".
332
b4f0ec5f
NC
333Often this option isn't as useful as it first seems, because I<any> build
334failure will be reported to C<git bisect> as a failure, not just the failure
335that you're interested in. Generally, to debug a particular problem, it's
336more useful to use a I<target> that builds properly at the point of interest,
337and then a test case that runs C<make>. For example:
338
339 .../Porting/bisect.pl --start=perl-5.000 --end=perl-5.002 \
340 --expect-fail --force-manifest --target=miniperl make perl
341
facd1b88
NC
342will find the first revision capable of building L<DynaLoader> and then
343F<perl>, without becoming confused by revisions where F<miniperl> won't
b4f0ec5f
NC
344even link.
345
77ae6092
NC
346=item *
347
b4f0ec5f
NC
348--force-manifest
349
77ae6092
NC
350By default, a build will "skip" if any files listed in F<MANIFEST> are not
351present. Usually this is useful, as it avoids false-failures. However, there
352are some long ranges of commits where listed files are missing, which can
353cause a bisect to abort because all that remain are skipped revisions.
354
355In these cases, particularly if the test case uses F<miniperl> and no modules,
356it may be more useful to force the build to continue, even if files
357F<MANIFEST> are missing.
358
359=item *
360
361--expect-pass [0|1]
362
363C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
364
365=item *
366
367--no-clean
368
369Tell F<bisect-runner.pl> not to clean up after the build. This allows one
370to use F<bisect-runner.pl> to build the current particular perl revision for
371interactive testing, or for debugging F<bisect-runner.pl>.
372
373Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
374
375=item *
376
377--check-args
378
379Validate the options and arguments, and exit silently if they are valid.
380
381=item *
382
383--usage
384
385=item *
386
387--help
388
389=item *
390
391-?
392
393Display the usage information and exit.
394
395=back
396
397=cut
398
0afef97d 399die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
6a8dbfd7
NC
400
401$j = "-j$j" if $j =~ /\A\d+\z/;
402
0142f0ce
NC
403# Sadly, however hard we try, I don't think that it will be possible to build
404# modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
405# which updated to MakeMaker 3.7, which changed from using a hard coded ld
406# in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
407
6a8dbfd7
NC
408sub extract_from_file {
409 my ($file, $rx, $default) = @_;
410 open my $fh, '<', $file or die "Can't open $file: $!";
411 while (<$fh>) {
412 my @got = $_ =~ $rx;
413 return wantarray ? @got : $got[0]
414 if @got;
415 }
416 return $default if defined $default;
417 return;
418}
419
c59e8fd6
NC
420sub edit_file {
421 my ($file, $munger) = @_;
422 local $/;
423 open my $fh, '<', $file or die "Can't open $file: $!";
424 my $orig = <$fh>;
425 die "Can't read $file: $!" unless defined $orig && close $fh;
426 my $new = $munger->($orig);
427 return if $new eq $orig;
428 open $fh, '>', $file or die "Can't open $file: $!";
429 print $fh $new or die "Can't print to $file: $!";
430 close $fh or die "Can't close $file: $!";
431}
432
433sub apply_patch {
434 my $patch = shift;
435
436 my ($file) = $patch =~ qr!^diff.*a/(\S+) b/\1!;
437 open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
438 print $fh $patch;
5fceabf3
NC
439 return if close $fh;
440 print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
441 die "Can't patch $file: $?, $!";
c59e8fd6
NC
442}
443
ab4a15f9 444sub clean {
f4800c99 445 if ($options{clean}) {
ab4a15f9
NC
446 # Needed, because files that are build products in this checked out
447 # version might be in git in the next desired version.
9da8cb0a 448 system 'git clean -dxf </dev/null';
ab4a15f9
NC
449 # Needed, because at some revisions the build alters checked out files.
450 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
9da8cb0a 451 system 'git reset --hard HEAD </dev/null';
ab4a15f9
NC
452 }
453}
454
455sub skip {
456 my $reason = shift;
457 clean();
458 warn "skipping - $reason";
459 exit 125;
460}
461
f1050811
NC
462sub report_and_exit {
463 my ($ret, $pass, $fail, $desc) = @_;
464
465 clean();
466
f4800c99 467 my $got = ($options{'expect-pass'} ? !$ret : $ret) ? 'good' : 'bad';
f1050811
NC
468 if ($ret) {
469 print "$got - $fail $desc\n";
470 } else {
471 print "$got - $pass $desc\n";
472 }
473
474 exit($got eq 'bad');
475}
476
0afef97d
NC
477sub match_and_exit {
478 my $target = shift;
479 my $matches = 0;
480 my $re = qr/$match/;
481 my @files;
482
483 {
484 local $/ = "\0";
485 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
486 chomp @files;
487 }
488
489 foreach my $file (@files) {
490 open my $fh, '<', $file or die "Can't open $file: $!";
491 while (<$fh>) {
492 if ($_ =~ $re) {
493 ++$matches;
494 if (tr/\t\r\n -~\200-\377//c) {
495 print "Binary file $file matches\n";
496 } else {
497 $_ .= "\n" unless /\n\z/;
498 print "$file: $_";
499 }
500 }
501 }
502 close $fh or die "Can't close $file: $!";
503 }
504 report_and_exit(!$matches,
505 $matches == 1 ? '1 match for' : "$matches matches for",
506 'no matches for', $match);
507}
508
6a8dbfd7 509# Not going to assume that system perl is yet new enough to have autodie
9da8cb0a 510system 'git clean -dxf </dev/null' and die;
6a8dbfd7 511
0afef97d
NC
512if (!defined $target) {
513 match_and_exit() if $match;
514 $target = 'test_prep';
bc96a05a
NC
515}
516
4b081584
NC
517skip('no Configure - is this the //depot/perlext/Compiler branch?')
518 unless -f 'Configure';
519
dbcdc176
NC
520# This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
521my $major
522 = extract_from_file('patchlevel.h',
523 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
524 0);
525
0142f0ce
NC
526if ($major < 1) {
527 if (extract_from_file('Configure',
528 qr/^ \*=\*\) echo "\$1" >> \$optdef;;$/)) {
529 # This is " Spaces now allowed in -D command line options.",
530 # part of commit ecfc54246c2a6f42
531 apply_patch(<<'EOPATCH');
532diff --git a/Configure b/Configure
533index 3d3b38d..78ffe16 100755
534--- a/Configure
535+++ b/Configure
536@@ -652,7 +777,8 @@ while test $# -gt 0; do
537 echo "$me: use '-U symbol=', not '-D symbol='." >&2
538 echo "$me: ignoring -D $1" >&2
539 ;;
540- *=*) echo "$1" >> $optdef;;
541+ *=*) echo "$1" | \
542+ sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
543 *) echo "$1='define'" >> $optdef;;
544 esac
545 shift
546EOPATCH
547 }
548 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
549 # Configure's original simple "grep" for d_namlen falls foul of the
550 # approach taken by the glibc headers:
551 # #ifdef _DIRENT_HAVE_D_NAMLEN
552 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
553 #
554 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
555 # This is also part of commit ecfc54246c2a6f42
556 apply_patch(<<'EOPATCH');
557diff --git a/Configure b/Configure
558index 3d3b38d..78ffe16 100755
559--- a/Configure
560+++ b/Configure
561@@ -3935,7 +4045,8 @@ $rm -f try.c
562
563 : see if the directory entry stores field length
564 echo " "
565-if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
566+$cppstdin $cppflags $cppminus < "$xinc" > try.c
567+if $contains 'd_namlen' try.c >/dev/null 2>&1; then
568 echo "Good, your directory entry keeps length information in d_namlen." >&4
569 val="$define"
570 else
571EOPATCH
572 }
573}
d90ae42b 574
af7c500f
NC
575if ($major < 8 && !extract_from_file('Configure',
576 qr/^\t\tif test ! -t 0; then$/)) {
7c22f158
NC
577 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was not a
578 # tty. With that commit, the tty requirement was dropped for -de and -dE
af7c500f 579 # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S
7c22f158
NC
580 # For those older versions, it's probably easiest if we simply remove the
581 # sanity test.
af7c500f
NC
582 edit_file('Configure', sub {
583 my $code = shift;
584 $code =~ s/test ! -t 0/test Perl = rules/;
585 return $code;
586 });
7c22f158
NC
587}
588
d90ae42b 589if ($major < 10 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
5541f5e3
NC
590 # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as
591 # prior to bd9b35c97ad661cc Configure had the malloc.h test before the
592 # definition of $compile.
d90ae42b
NC
593 apply_patch(<<'EOPATCH');
594diff --git a/Configure b/Configure
595index 3d2e8b9..6ce7766 100755
596--- a/Configure
597+++ b/Configure
598@@ -6743,5 +6743,22 @@ set d_dosuid
599
600 : see if this is a malloc.h system
601-set malloc.h i_malloc
602-eval $inhdr
603+: we want a real compile instead of Inhdr because some systems have a
604+: malloc.h that just gives a compile error saying to use stdlib.h instead
605+echo " "
606+$cat >try.c <<EOCP
607+#include <stdlib.h>
608+#include <malloc.h>
609+int main () { return 0; }
610+EOCP
611+set try
5541f5e3 612+if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then
d90ae42b
NC
613+ echo "<malloc.h> found." >&4
614+ val="$define"
615+else
616+ echo "<malloc.h> NOT found." >&4
617+ val="$undef"
618+fi
619+$rm -f try.c try
620+set i_malloc
621+eval $setvar
622
623EOPATCH
624}
a1756669 625
6ff3edb1
NC
626if ($major < 10 && -d 'ext/Unicode/Normalize/'
627 && !extract_from_file('Configure', qr/^extra_dep=''$/)) {
628 # The Makefile.PL for Unicode::Normalize needs
629 # lib/unicore/CombiningClass.pl. Even without a parallel build, we need
630 # a dependency to ensure that it builds. This is a variant of commit
631 # 9f3ef600c170f61e
632 apply_patch(<<'EOPATCH');
633diff --git a/Makefile.SH b/Makefile.SH
634index f61d0db..6097954 100644
635--- a/Makefile.SH
636+++ b/Makefile.SH
637@@ -155,10 +155,20 @@ esac
638
639 : Prepare dependency lists for Makefile.
640 dynamic_list=' '
641+extra_dep=''
642 for f in $dynamic_ext; do
643 : the dependency named here will never exist
644 base=`echo "$f" | sed 's/.*\///'`
645- dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
646+ this_target="lib/auto/$f/$base.$dlext"
647+ dynamic_list="$dynamic_list $this_target"
648+
649+ : Parallel makes reveal that we have some interdependencies
650+ case $f in
651+ Math/BigInt/FastCalc) extra_dep="$extra_dep
652+$this_target: lib/auto/List/Util/Util.$dlext" ;;
653+ Unicode/Normalize) extra_dep="$extra_dep
654+$this_target: lib/unicore/CombiningClass.pl" ;;
655+ esac
656 done
657
658 static_list=' '
659@@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
660 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
661+!NO!SUBS!
662+
663+$spitshell >>Makefile <<EOF
664+$extra_dep
665+EOF
666+
667+$spitshell >>Makefile <<'!NO!SUBS!'
668
669EOPATCH
670}
671
6a8dbfd7
NC
672# There was a bug in makedepend.SH which was fixed in version 96a8704c.
673# Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
674# Remove this if you're actually bisecting a problem related to makedepend.SH
9da8cb0a 675system 'git show blead:makedepend.SH > makedepend.SH </dev/null' and die;
6a8dbfd7 676
d64af352
NC
677if ($^O eq 'freebsd') {
678 # There are rather too many version-specific FreeBSD hints fixes to patch
679 # individually. Also, more than once the FreeBSD hints file has been
680 # written in what turned out to be a rather non-future-proof style,
681 # with case statements treating the most recent version as the exception,
682 # instead of treating previous versions' behaviour explicitly and changing
683 # the default to cater for the current behaviour. (As strangely, future
684 # versions inherit the current behaviour.)
9da8cb0a
NC
685 system 'git show blead:hints/freebsd.sh > hints/freebsd.sh </dev/null'
686 and die;
641e2ba6
NC
687
688 if ($major < 2) {
689 # 5.002 Configure and later have code to
690 #
691 # : Try to guess additional flags to pick up local libraries.
692 #
693 # which will automatically add --L/usr/local/lib because libpth
694 # contains /usr/local/lib
695 #
696 # Without it, if Configure finds libraries in /usr/local/lib (eg
697 # libgdbm.so) and adds them to the compiler commandline (as -lgdbm),
698 # then the link will fail. We can't fix this up in config.sh because
699 # the link will *also* fail in the test compiles that Configure does
700 # (eg $inlibc) which makes Configure get all sorts of things
701 # wrong. :-( So bodge it here.
702 #
703 # Possibly other platforms will need something similar. (if they
704 # have "wanted" libraries in /usr/local/lib, but the compiler
705 # doesn't default to putting that directory in its link path)
706 apply_patch(<<'EOPATCH');
707--- perl2/hints/freebsd.sh.orig 2011-10-05 16:44:55.000000000 +0200
708+++ perl2/hints/freebsd.sh 2011-10-05 16:45:52.000000000 +0200
709@@ -125,7 +125,7 @@
710 else
711 libpth="/usr/lib /usr/local/lib"
712 glibpth="/usr/lib /usr/local/lib"
713- ldflags="-Wl,-E "
714+ ldflags="-Wl,-E -L/usr/local/lib "
715 lddlflags="-shared "
716 fi
717 cccdlflags='-DPIC -fPIC'
718@@ -133,7 +133,7 @@
719 *)
720 libpth="/usr/lib /usr/local/lib"
721 glibpth="/usr/lib /usr/local/lib"
722- ldflags="-Wl,-E "
723+ ldflags="-Wl,-E -L/usr/local/lib "
724 lddlflags="-shared "
725 cccdlflags='-DPIC -fPIC'
726 ;;
641e2ba6
NC
727EOPATCH
728 }
915f531b
NC
729} elsif ($^O eq 'darwin') {
730 if ($major < 8) {
731 my $faking_it;
732 # We can't build on darwin without some of the data in the hints file.
733 foreach ('ext/DynaLoader/dl_dyld.xs', 'hints/darwin.sh') {
734 next if -f $_;
735 ++$faking_it;
736 # Probably less surprising to use the earliest version of
737 # hints/darwin.sh and then edit in place just below, than use
738 # blead's version, as that would create a discontinuity at
739 # f556e5b971932902 - before it, hints bugs would be "fixed", after
740 # it they'd resurface. This way, we should give the illusion of
741 # monotonic bug fixing.
742 system "git show f556e5b971932902:$_ >$_"
743 and die "while attempting to extract $_";
744 }
745 if ($faking_it) {
746 apply_patch(<<'EOPATCH');
747diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
748--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:41:27.000000000 +0100
749+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 21:42:20.000000000 +0100
750@@ -41,6 +41,35 @@
751 #include "perl.h"
752 #include "XSUB.h"
753
754+#ifndef pTHX
755+# define pTHX void
756+# define pTHX_
757+#endif
758+#ifndef aTHX
759+# define aTHX
760+# define aTHX_
761+#endif
762+#ifndef dTHX
763+# define dTHXa(a) extern int Perl___notused(void)
764+# define dTHX extern int Perl___notused(void)
765+#endif
766+
767+#ifndef Perl_form_nocontext
768+# define Perl_form_nocontext form
769+#endif
770+
771+#ifndef Perl_warn_nocontext
772+# define Perl_warn_nocontext warn
773+#endif
774+
775+#ifndef PTR2IV
776+# define PTR2IV(p) (IV)(p)
777+#endif
778+
779+#ifndef get_av
780+# define get_av perl_get_av
781+#endif
782+
783 #define DL_LOADONCEONLY
784
785 #include "dlutils.c" /* SaveError() etc */
786@@ -185,7 +191,7 @@
787 CODE:
788 DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags));
789 if (flags & 0x01)
790- Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename);
791+ Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename);
792 RETVAL = dlopen(filename, mode) ;
793 DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL));
794 ST(0) = sv_newmortal() ;
795EOPATCH
796 if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) {
797 apply_patch(<<'EOPATCH');
798diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
799--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100
800+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100
801@@ -60,6 +60,18 @@
802 # define get_av perl_get_av
803 #endif
804
805+static char *
806+form(char *pat, ...)
807+{
808+ char *retval;
809+ va_list args;
810+ va_start(args, pat);
811+ vasprintf(&retval, pat, &args);
812+ va_end(args);
813+ SAVEFREEPV(retval);
814+ return retval;
815+}
816+
817 #define DL_LOADONCEONLY
818
819 #include "dlutils.c" /* SaveError() etc */
820EOPATCH
821 }
822 }
823
824 edit_file('hints/darwin.sh', sub {
825 my $code = shift;
826 # Part of commit 8f4f83badb7d1ba9, which mostly undoes
827 # commit 0511a818910f476c.
828 $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m;
829 # commit 14c11978e9b52e08/803bb6cc74d36a3f
830 # Without this, code in libperl.bundle links against op.o
831 # in preference to opmini.o on the linker command line,
832 # and hence miniperl tries to use File::Glob instead of
833 # csh
834 $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m;
835 # f556e5b971932902 also patches Makefile.SH with some
836 # special case code to deal with useshrplib for darwin.
837 # Given that post 5.8.0 the darwin hints default was
838 # changed to false, and it would be very complex to splice
839 # in that code in various versions of Makefile.SH back
840 # to 5.002, lets just turn it off.
841 $code =~ s/^useshrplib='true'/useshrplib='false'/m
842 if $faking_it;
843 return $code;
844 });
845 }
d64af352
NC
846}
847
cfadff5f
NC
848if ($major < 10) {
849 if (!extract_from_file('ext/DB_File/DB_File.xs',
850 qr!^#else /\* Berkeley DB Version > 2 \*/$!)) {
851 # This DB_File.xs is really too old to patch up.
852 # Skip DB_File, unless we're invoked with an explicit -Unoextensions
853 if (!exists $defines{noextensions}) {
854 $defines{noextensions} = 'DB_File';
855 } elsif (defined $defines{noextensions}) {
856 $defines{noextensions} .= ' DB_File';
857 }
858 } elsif (!extract_from_file('ext/DB_File/DB_File.xs',
859 qr/^#ifdef AT_LEAST_DB_4_1$/)) {
860 # This line is changed by commit 3245f0580c13b3ab
861 my $line = extract_from_file('ext/DB_File/DB_File.xs',
862 qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/);
863 apply_patch(<<"EOPATCH");
864diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
865index 489ba96..fba8ded 100644
866--- a/ext/DB_File/DB_File.xs
867+++ b/ext/DB_File/DB_File.xs
868\@\@ -183,4 +187,8 \@\@
869 #endif
870
871+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
872+# define AT_LEAST_DB_4_1
873+#endif
874+
875 /* map version 2 features & constants onto their version 1 equivalent */
876
877\@\@ -1334,7 +1419,12 \@\@ SV * sv ;
878 #endif
879
880+#ifdef AT_LEAST_DB_4_1
881+ status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL, RETVAL->type,
882+ Flags, mode) ;
883+#else
884 $line
885 Flags, mode) ;
886+#endif
887 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */
888
889EOPATCH
890 }
891}
892
6a8dbfd7
NC
893# if Encode is not needed for the test, you can speed up the bisect by
894# excluding it from the runs with -Dnoextensions=Encode
895# ccache is an easy win. Remove it if it causes problems.
6a8dbfd7
NC
896# Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
897# to true in hints/linux.sh
898# On dromedary, from that point on, Configure (by default) fails to find any
899# libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
900# versioned libraries. Without -lm, the build fails.
901# Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
902# until commit faae14e6e968e1c0 adds it to the hints.
903# However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
904# because it will spot versioned libraries, pass them to the compiler, and then
905# bail out pretty early on. Configure won't let us override libswanted, but it
906# will let us override the entire libs list.
907
908unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
909 # Before 1cfa4ec74d4933da, so force the libs list.
910
911 my @libs;
912 # This is the current libswanted list from Configure, less the libs removed
913 # by current hints/linux.sh
914 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld
915 ld sun m crypt sec util c cposix posix ucb BSD)) {
916 foreach my $dir (@paths) {
917 next unless -f "$dir/lib$lib.so";
918 push @libs, "-l$lib";
919 last;
920 }
921 }
390a69a9 922 $defines{libs} = \@libs unless exists $defines{libs};
6a8dbfd7
NC
923}
924
4b081584
NC
925# This seems to be necessary to avoid makedepend becoming confused, and hanging
926# on stdin. Seems that the code after make shlist || ...here... is never run.
390a69a9
NC
927$defines{trnl} = q{'\n'}
928 if $major < 4 && !exists $defines{trnl};
4b081584 929
390a69a9
NC
930$defines{usenm} = undef
931 if $major < 2 && !exists $defines{usenm};
0142f0ce 932
67382a3b
NC
933my (@missing, @created_dirs);
934
f4800c99 935if ($options{'force-manifest'}) {
67382a3b
NC
936 open my $fh, '<', 'MANIFEST'
937 or die "Could not open MANIFEST: $!";
938 while (<$fh>) {
939 next unless /^(\S+)/;
940 push @missing, $1
941 unless -f $1;
942 }
943 close $fh or die "Can't close MANIFEST: $!";
944
945 foreach my $pathname (@missing) {
946 my @parts = split '/', $pathname;
947 my $leaf = pop @parts;
948 my $path = '.';
949 while (@parts) {
950 $path .= '/' . shift @parts;
951 next if -d $path;
952 mkdir $path, 0700 or die "Can't create $path: $!";
953 unshift @created_dirs, $path;
954 }
955 open $fh, '>', $pathname or die "Can't open $pathname: $!";
956 close $fh or die "Can't close $pathname: $!";
957 chmod 0, $pathname or die "Can't chmod 0 $pathname: $!";
958 }
959}
960
af7c500f 961my @ARGS = '-dEs';
390a69a9
NC
962foreach my $key (sort keys %defines) {
963 my $val = $defines{$key};
964 if (ref $val) {
965 push @ARGS, "-D$key=@$val";
966 } elsif (!defined $val) {
967 push @ARGS, "-U$key";
968 } elsif (!length $val) {
969 push @ARGS, "-D$key";
970 } else {
971 $val = "" if $val eq "\0";
972 push @ARGS, "-D$key=$val";
973 }
974}
975push @ARGS, map {"-A$_"} @{$options{A}};
976
6a8dbfd7
NC
977# </dev/null because it seems that some earlier versions of Configure can
978# call commands in a way that now has them reading from stdin (and hanging)
979my $pid = fork;
980die "Can't fork: $!" unless defined $pid;
981if (!$pid) {
7c22f158
NC
982 open STDIN, '<', '/dev/null';
983 # If a file in MANIFEST is missing, Configure asks if you want to
984 # continue (the default being 'n'). With stdin closed or /dev/null,
985 # it exits immediately and the check for config.sh below will skip.
6a8dbfd7
NC
986 exec './Configure', @ARGS;
987 die "Failed to start Configure: $!";
988}
989waitpid $pid, 0
990 or die "wait for Configure, pid $pid failed: $!";
991
af7c500f
NC
992# Emulate noextensions if Configure doesn't support it.
993if (-f 'config.sh') {
994 if ($major < 10 && $defines{noextensions}) {
995 edit_file('config.sh', sub {
996 my @lines = split /\n/, shift;
997 my @ext = split /\s+/, $defines{noextensions};
998 foreach (@lines) {
999 next unless /^extensions=/ || /^dynamic_ext/;
1000 foreach my $ext (@ext) {
1001 s/\b$ext( )?\b/$1/;
1002 }
1003 }
1004 return join "\n", @lines;
1005 });
1006 }
1007 system './Configure -S </dev/null' and die;
1008}
1009
0afef97d
NC
1010if ($target =~ /config\.s?h/) {
1011 match_and_exit($target) if $match && -f $target;
dd4e46d7
NC
1012 report_and_exit(!-f $target, 'could build', 'could not build', $target);
1013} elsif (!-f 'config.sh') {
1014 # Skip if something went wrong with Configure
1015
1016 skip('could not build config.sh');
1017}
6a8dbfd7 1018
67382a3b
NC
1019# This is probably way too paranoid:
1020if (@missing) {
1021 my @errors;
eb4906f4 1022 require Fcntl;
67382a3b
NC
1023 foreach my $file (@missing) {
1024 my (undef, undef, $mode, undef, undef, undef, undef, $size)
1025 = stat $file;
1026 if (!defined $mode) {
1027 push @errors, "Added file $file has been deleted by Configure";
1028 next;
1029 }
eb4906f4 1030 if (Fcntl::S_IMODE($mode) != 0) {
67382a3b
NC
1031 push @errors,
1032 sprintf 'Added file %s had mode changed by Configure to %03o',
1033 $file, $mode;
1034 }
1035 if ($size != 0) {
1036 push @errors,
1037 "Added file $file had sized changed by Configure to $size";
1038 }
1039 unlink $file or die "Can't unlink $file: $!";
1040 }
1041 foreach my $dir (@created_dirs) {
1042 rmdir $dir or die "Can't rmdir $dir: $!";
1043 }
6c0925a0
NC
1044 skip("@errors")
1045 if @errors;
67382a3b
NC
1046}
1047
6a8dbfd7
NC
1048# Correct makefile for newer GNU gcc
1049# Only really needed if you comment out the use of blead's makedepend.SH
1050{
1051 local $^I = "";
1052 local @ARGV = qw(makefile x2p/makefile);
1053 while (<>) {
1054 print unless /<(?:built-in|command|stdin)/;
1055 }
1056}
6a8dbfd7 1057
0142f0ce
NC
1058if ($major == 2 && extract_from_file('perl.c', qr/^ fclose\(e_fp\);$/)) {
1059 # need to patch perl.c to avoid calling fclose() twice on e_fp when using -e
1060 # This diff is part of commit ab821d7fdc14a438. The second close was
1061 # introduced with perl-5.002, commit a5f75d667838e8e7
1062 # Might want a6c477ed8d4864e6 too, for the corresponding change to pp_ctl.c
1063 # (likely without this, eval will have "fun")
1064 apply_patch(<<'EOPATCH');
1065diff --git a/perl.c b/perl.c
1066index 03c4d48..3c814a2 100644
1067--- a/perl.c
1068+++ b/perl.c
1069@@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
1070 #ifndef VMS /* VMS doesn't have environ array */
1071 origenviron = environ;
1072 #endif
1073+ e_tmpname = Nullch;
1074
1075 if (do_undump) {
1076
1077@@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
1078 if (e_fp) {
1079 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
1080 croak("Can't write to temp file for -e: %s", Strerror(errno));
1081+ e_fp = Nullfp;
1082 argc++,argv--;
1083 scriptname = e_tmpname;
1084 }
1085@@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
1086 curcop->cop_line = 0;
1087 curstash = defstash;
1088 preprocess = FALSE;
1089- if (e_fp) {
1090- fclose(e_fp);
1091- e_fp = Nullfp;
1092+ if (e_tmpname) {
1093 (void)UNLINK(e_tmpname);
1094+ Safefree(e_tmpname);
1095+ e_tmpname = Nullch;
1096 }
1097
1098 /* now that script is parsed, we can modify record separator */
1099@@ -1369,7 +1371,7 @@ SV *sv;
1100 scriptname = xfound;
1101 }
1102
1103- origfilename = savepv(e_fp ? "-e" : scriptname);
1104+ origfilename = savepv(e_tmpname ? "-e" : scriptname);
1105 curcop->cop_filegv = gv_fetchfile(origfilename);
1106 if (strEQ(origfilename,"-"))
1107 scriptname = "";
1108
1109EOPATCH
1110}
1111
c59e8fd6
NC
1112if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') {
1113 edit_file('ext/IPC/SysV/SysV.xs', sub {
1114 my $xs = shift;
1115 my $fixed = <<'EOFIX';
1116
1117#include <sys/types.h>
1118#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
1119#ifndef HAS_SEM
1120# include <sys/ipc.h>
1121#endif
1122# ifdef HAS_MSG
1123# include <sys/msg.h>
1124# endif
1125# ifdef HAS_SHM
1126# if defined(PERL_SCO) || defined(PERL_ISC)
1127# include <sys/sysmacros.h> /* SHMLBA */
1128# endif
1129# include <sys/shm.h>
1130# ifndef HAS_SHMAT_PROTOTYPE
1131 extern Shmat_t shmat (int, char *, int);
1132# endif
1133# if defined(HAS_SYSCONF) && defined(_SC_PAGESIZE)
1134# undef SHMLBA /* not static: determined at boot time */
1135# define SHMLBA sysconf(_SC_PAGESIZE)
1136# elif defined(HAS_GETPAGESIZE)
1137# undef SHMLBA /* not static: determined at boot time */
1138# define SHMLBA getpagesize()
1139# endif
1140# endif
1141#endif
1142EOFIX
1143 $xs =~ s!
1144#include <sys/types\.h>
1145.*
1146(#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms;
1147 return $xs;
1148 });
1149}
1150
9a999a97 1151# Parallel build for miniperl is safe
9da8cb0a 1152system "make $j miniperl </dev/null";
9a999a97 1153
2526f4b8
NC
1154my $expected = $target =~ /^test/ ? 't/perl'
1155 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
1156 : $target;
1157my $real_target = $target eq 'Fcntl' ? $expected : $target;
1158
9a999a97
NC
1159if ($target ne 'miniperl') {
1160 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
372ba1f9 1161 $j = '' if $major < 10;
9a999a97 1162
2526f4b8 1163 if ($real_target eq 'test_prep') {
9a999a97
NC
1164 if ($major < 8) {
1165 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
1166 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
1167 # earlier than that, just make test. It will be fast enough.
2526f4b8
NC
1168 $real_target = extract_from_file('Makefile.SH',
1169 qr/^(test[-_]prep):/,
1170 'test');
9a999a97 1171 }
6a8dbfd7 1172 }
6a8dbfd7 1173
9da8cb0a 1174 system "make $j $real_target </dev/null";
9a999a97 1175}
6a8dbfd7 1176
67382a3b
NC
1177my $missing_target = $expected =~ /perl$/ ? !-x $expected : !-r $expected;
1178
f4800c99 1179if ($options{'test-build'}) {
2526f4b8
NC
1180 report_and_exit($missing_target, 'could build', 'could not build',
1181 $real_target);
67382a3b 1182} elsif ($missing_target) {
2526f4b8 1183 skip("could not build $real_target");
67382a3b 1184}
6a8dbfd7 1185
2526f4b8 1186match_and_exit($real_target) if $match;
0afef97d
NC
1187
1188if (defined $options{'one-liner'}) {
2526f4b8 1189 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
0afef97d
NC
1190 unshift @ARGV, "./$exe", '-Ilib', '-e', $options{'one-liner'};
1191}
1192
6a8dbfd7 1193# This is what we came here to run:
915f531b
NC
1194
1195if (exists $Config{ldlibpthname}) {
1196 require Cwd;
1197 my $varname = $Config{ldlibpthname};
1198 my $cwd = Cwd::getcwd();
1199 if (defined $ENV{$varname}) {
1200 $ENV{$varname} = $cwd . $Config{path_sep} . $ENV{$varname};
1201 } else {
1202 $ENV{$varname} = $cwd;
1203 }
1204}
1205
6a8dbfd7
NC
1206my $ret = system @ARGV;
1207
f1050811 1208report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV");
9a999a97
NC
1209
1210# Local variables:
1211# cperl-indent-level: 4
1212# indent-tabs-mode: nil
1213# End:
1214#
1215# ex: set ts=8 sts=4 sw=4 et: