This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Three Configure fixups so that bisect-runner.pl can build 1997-era 5.004
[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 8my @targets
3f468b94 9 = qw(none config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep);
6a8dbfd7 10
f4800c99
NC
11my %options =
12 (
f4800c99
NC
13 'expect-pass' => 1,
14 clean => 1, # mostly for debugging this
15 );
6a8dbfd7 16
e3caab27
NC
17# We accept #!./miniperl and #!./perl
18# We don't accept #!miniperl and #!perl as their intent is ambiguous
19my $run_with_our_perl = qr{\A#!(\./(?:mini)?perl)\b};
20
fdbac266
NC
21my $linux64 = `uname -sm` eq "Linux x86_64\n" ? '64' : '';
22
599ee4f7
NC
23my @paths;
24
25if ($^O eq 'linux') {
26 # This is the search logic for a multi-arch library layout
27 # added to linux.sh in commits 40f026236b9959b7 and dcffd848632af2c7.
28 my $gcc = -x '/usr/bin/gcc' ? '/usr/bin/gcc' : 'gcc';
29
30 foreach (`$gcc -print-search-dirs`) {
31 next unless /^libraries: =(.*)/;
32 foreach (split ':', $1) {
33 next if m/gcc/;
34 next unless -d $_;
35 s!/$!!;
36 push @paths, $_;
37 }
38 }
8b569238
NC
39 push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib)
40 if $linux64;
599ee4f7
NC
41}
42
390a69a9
NC
43my %defines =
44 (
45 usedevel => '',
46 optimize => '-g',
9913adee 47 ld => 'cc',
8b569238 48 (@paths ? (libpth => \@paths) : ()),
390a69a9
NC
49 );
50
8b569238
NC
51# Needed for the 'ignore_versioned_solibs' emulation below.
52push @paths, qw(/usr/local/lib /lib /usr/lib)
53 unless $linux64;
54
f4800c99 55unless(GetOptions(\%options,
32ffe018 56 'target=s', 'make=s', 'jobs|j=i', 'expect-pass=i',
f4800c99 57 'expect-fail' => sub { $options{'expect-pass'} = 0; },
529d2ac2 58 'clean!', 'one-liner|e=s', 'c', 'l', 'w', 'match=s',
66b521dd
NC
59 'no-match=s' => sub {
60 $options{match} = $_[1];
61 $options{'expect-pass'} = 0;
62 },
1fdd0dcc 63 'force-manifest', 'force-regen', 'setpgrp!', 'timeout=i',
b9dcd8de 64 'test-build', 'validate',
54c7e1f0 65 'all-fixups', 'early-fixup=s@', 'late-fixup=s@', 'valgrind',
02b83d1d
NC
66 'check-args', 'check-shebang!', 'usage|help|?', 'gold=s',
67 'A=s@',
390a69a9
NC
68 'D=s@' => sub {
69 my (undef, $val) = @_;
70 if ($val =~ /\A([^=]+)=(.*)/s) {
71 $defines{$1} = length $2 ? $2 : "\0";
72 } else {
73 $defines{$val} = '';
74 }
75 },
76 'U=s@' => sub {
77 $defines{$_[1]} = undef;
78 },
6a8dbfd7 79 )) {
77ae6092 80 pod2usage(exitval => 255, verbose => 1);
6a8dbfd7
NC
81}
82
0bc550ba 83my ($target, $match) = @options{qw(target match)};
e295b7be 84
b826a648
NC
85@ARGV = ('sh', '-c', 'cd t && ./perl TEST base/*.t')
86 if $options{validate} && !@ARGV;
87
8fc3c209 88pod2usage(exitval => 0, verbose => 2) if $options{usage};
77ae6092
NC
89pod2usage(exitval => 255, verbose => 1)
90 unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
fc4401c6
NC
91pod2usage(exitval => 255, verbose => 1)
92 if !$options{'one-liner'} && ($options{l} || $options{w});
6a8dbfd7 93
bf8fb529
NC
94check_shebang($ARGV[0])
95 if $options{'check-shebang'} && @ARGV && !$options{match};
7cffc32d 96
f4800c99 97exit 0 if $options{'check-args'};
6a8dbfd7 98
77ae6092
NC
99=head1 NAME
100
101bisect.pl - use git bisect to pinpoint changes
102
103=head1 SYNOPSIS
104
105 # When did this become an error?
106 .../Porting/bisect.pl -e 'my $a := 2;'
71d80638 107 # When did this stop being an error?
77ae6092 108 .../Porting/bisect.pl --expect-fail -e '1 // 2'
80be57dd 109 # When were all lines matching this pattern removed from all files?
77ae6092 110 .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
80be57dd 111 # When was some line matching this pattern added to some file?
77ae6092 112 .../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
80be57dd 113 # When did this test program stop exiting 0?
d398528a 114 .../Porting/bisect.pl -- ./perl -Ilib ../test_prog.pl
f7f0fdee
JL
115 # When did this test start failing?
116 .../Porting/bisect.pl -- ./perl -Ilib t/TEST op/sort.t
77ae6092
NC
117 # When did this first become valid syntax?
118 .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
119 --expect-fail -e 'my $a := 2;'
120 # What was the last revision to build with these options?
121 .../Porting/bisect.pl --test-build -Dd_dosuid
54c7e1f0
NC
122 # When did this test program start generating errors from valgrind?
123 .../Porting/bisect.pl --valgrind ../test_prog.pl
77ae6092
NC
124
125=head1 DESCRIPTION
126
facd1b88 127Together F<bisect.pl> and F<bisect-runner.pl> attempt to automate the use
77ae6092
NC
128of C<git bisect> as much as possible. With one command (and no other files)
129it's easy to find out
130
131=over 4
132
133=item *
134
135Which commit caused this example code to break?
136
137=item *
138
139Which commit caused this example code to start working?
140
141=item *
142
a9b1bbfe 143Which commit added the first file to match this regex?
77ae6092
NC
144
145=item *
146
a9b1bbfe 147Which commit removed the last file to match this regex?
77ae6092
NC
148
149=back
150
151usually without needing to know which versions of perl to use as start and
152end revisions.
153
facd1b88 154By default F<bisect.pl> will process all options, then use the rest of the
77ae6092
NC
155command line as arguments to list C<system> to run a test case. By default,
156the test case should pass (exit with 0) on earlier perls, and fail (exit
f7f0fdee
JL
157non-zero) on I<blead> (note that running most of perl's test files directly
158won't do this, you'll need to run them through a harness to get the proper
159error code). F<bisect.pl> will use F<bisect-runner.pl> to find the earliest
160stable perl version on which the test case passes, check that it fails on
161blead, and then use F<bisect-runner.pl> with C<git bisect run> to find the
162commit which caused the failure.
77ae6092
NC
163
164Because the test case is the complete argument to C<system>, it is easy to
165run something other than the F<perl> built, if necessary. If you need to run
e3caab27
NC
166the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>.
167As a special case, if the first argument of the test case is a readable file
168(whether executable or not), matching C<qr{\A#!./(?:mini)?perl\b}> then it
169will have C<./perl> <-Ilib> (or C<./miniperl>) prepended to it.
77ae6092 170
5842706e
NC
171You need a clean checkout to run a bisect, and you can't use the checkout
172which contains F<Porting/bisect.pl> (because C<git bisect>) will check out
173a revision before F<Porting/bisect-runner.pl> was added, which
174C<git bisect run> needs). If your working checkout is called F<perl>, the
175simplest solution is to make a local clone, and run from that. I<i.e.>:
176
177 cd ..
178 git clone perl perl2
179 cd perl2
180 ../perl/Porting/bisect.pl ...
181
facd1b88 182By default, F<bisect-runner.pl> will automatically disable the build of
cfadff5f
NC
183L<DB_File> for commits earlier than ccb44e3bf3be2c30, as it's not practical
184to patch DB_File 1.70 and earlier to build with current Berkeley DB headers.
185(ccb44e3bf3be2c30 was in September 1999, between 5.005_62 and 5.005_63.)
186If your F<db.h> is old enough you can override this with C<-Unoextensions>.
187
77ae6092
NC
188=head1 OPTIONS
189
190=over 4
191
192=item *
193
194--start I<commit-ish>
195
196Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
facd1b88 197else C<git> understands as a revision). If not specified, F<bisect.pl> will
f66c64b1
NC
198search stable .0 perl releases until it finds one where the test case passes
199(5.16.0 at the time of writing). The default is to search from 5.002 to the
200most recent tagged stable release. If F<bisect.pl> detects that the
201checkout is on a case insensitive file system, it will search from 5.005 to
202the most recent tagged stable release. Only .0 stable releases are used
203because these are the only stable releases that are parents of blead, and
204hence suitable for a bisect run.
77ae6092
NC
205
206=item *
207
208--end I<commit-ish>
209
210Most recent revision to test, as a I<commit-ish>. If not specified, defaults
b4f0ec5f 211to I<blead>.
77ae6092
NC
212
213=item *
214
215--target I<target>
216
217F<Makefile> target (or equivalent) needed, to run the test case. If specified,
218this should be one of
219
220=over 4
221
222=item *
223
3f468b94
NC
224I<none>
225
226Don't build anything - just run the user test case against a clean checkout.
227Using this gives a couple of features that a plain C<git bisect run> can't
228offer - automatic start revision detection, and test case C<--timeout>.
229
230=item *
231
77ae6092
NC
232I<config.sh>
233
facd1b88 234Just run F<./Configure>
77ae6092
NC
235
236=item *
237
238I<config.h>
239
240Run the various F<*.SH> files to generate F<Makefile>, F<config.h>, I<etc>.
241
242=item *
243
244I<miniperl>
245
246Build F<miniperl>.
247
248=item *
249
250I<lib/Config.pm>
251
252Use F<miniperl> to build F<lib/Config.pm>
253
254=item *
255
2526f4b8
NC
256I<Fcntl>
257
258Build F<lib/auto/Fcntl/Fnctl.so> (strictly, C<.$Config{so}>). As L<Fcntl>
259is simple XS module present since 5.000, this provides a fast test of
b4f0ec5f 260whether XS modules can be built. Note, XS modules are built by F<miniperl>,
2526f4b8
NC
261hence this target will not build F<perl>.
262
263=item *
264
77ae6092
NC
265I<perl>
266
267Build F<perl>. This also builds pure-Perl modules in F<cpan>, F<dist> and
2526f4b8
NC
268F<ext>. XS modules (such as L<Fcntl>) are not built.
269
270=item *
271
77ae6092
NC
272I<test_prep>
273
274Build everything needed to run the tests. This is the default if we're
275running test code, but is time consuming, as it means building all
b4f0ec5f 276XS modules. For older F<Makefile>s, the previous name of C<test-prep>
77ae6092
NC
277is automatically substituted. For very old F<Makefile>s, C<make test> is
278run, as there is no target provided to just get things ready, and for 5.004
279and earlier the tests run very quickly.
280
281=back
282
283=item *
284
285--one-liner 'code to run'
286
287=item *
288
289-e 'code to run'
290
a1756669 291Example code to run, just like you'd use with C<perl -e>.
77ae6092
NC
292
293This prepends C<./perl -Ilib -e 'code to run'> to the test case given,
facd1b88 294or F<./miniperl> if I<target> is C<miniperl>.
77ae6092
NC
295
296(Usually you'll use C<-e> instead of providing a test case in the
facd1b88 297non-option arguments to F<bisect.pl>)
77ae6092
NC
298
299C<-E> intentionally isn't supported, as it's an error in 5.8.0 and earlier,
300which interferes with detecting errors in the example code itself.
301
302=item *
303
529d2ac2
NC
304-c
305
306Add C<-c> to the command line, to cause perl to exit after syntax checking.
307
308=item *
309
fc4401c6
NC
310-l
311
312Add C<-l> to the command line with C<-e>
313
314This will automatically append a newline to every output line of your testcase.
315Note that you can't specify an argument to F<perl>'s C<-l> with this, as it's
316not feasible to emulate F<perl>'s somewhat quirky switch parsing with
317L<Getopt::Long>. If you need the full flexibility of C<-l>, you need to write
318a full test case, instead of using C<bisect.pl>'s C<-e> shortcut.
319
320=item *
321
322-w
323
324Add C<-w> to the command line with C<-e>
325
529d2ac2
NC
326It's not valid to pass C<-c>, C<-l> or C<-w> to C<bisect.pl> unless you are
327also using C<-e>
fc4401c6
NC
328
329=item *
330
77ae6092
NC
331--expect-fail
332
333The test case should fail for the I<start> revision, and pass for the I<end>
334revision. The bisect run will find the first commit where it passes.
335
336=item *
337
28c4aad0 338-D I<config_arg=value>
77ae6092
NC
339
340=item *
341
28c4aad0 342-U I<config_arg>
77ae6092
NC
343
344=item *
345
28c4aad0 346-A I<config_arg=value>
77ae6092 347
28c4aad0
DM
348Arguments (C<-A>, C<-D>, C<-U>) to pass to F<Configure>. For example,
349
350 -Dnoextensions=Encode
351 -Uusedevel
352 -Accflags=-DNO_MATHOMS
353
354Repeated C<-A> arguments are passed
77ae6092 355through as is. C<-D> and C<-U> are processed in order, and override
af7c500f
NC
356previous settings for the same parameter. F<bisect-runner.pl> emulates
357C<-Dnoextensions> when F<Configure> itself does not provide it, as it's
358often very useful to be able to disable some XS extensions.
77ae6092
NC
359
360=item *
361
32ffe018
NC
362--make I<make-prog>
363
364The C<make> command to use. If this not set, F<make> is used. If this is
365set, it also adds a C<-Dmake=...> else some recursive make invocations
366in extensions may fail. Typically one would use this as C<--make gmake>
367to use F<gmake> in place of the system F<make>.
368
369=item *
370
b4f0ec5f 371--jobs I<jobs>
77ae6092
NC
372
373=item *
374
b4f0ec5f 375-j I<jobs>
77ae6092 376
d3232d34
NC
377Number of C<make> jobs to run in parallel. A value of 0 suppresses
378parallelism. If F</proc/cpuinfo> exists and can be parsed, or F</sbin/sysctl>
379exists and reports C<hw.ncpu>, or F</usr/bin/getconf> exists and reports
380C<_NPROCESSORS_ONLN> defaults to 1 + I<number of CPUs>. On HP-UX with the
381system make defaults to 0, otherwise defaults to 2.
77ae6092
NC
382
383=item *
384
b4f0ec5f 385--match pattern
77ae6092 386
66b521dd
NC
387=item *
388
389--no-match pattern
390
391Instead of running a test program to determine I<pass> or I<fail>,
392C<--match> will pass if the given regex matches, and hence search for the
393commit that removes the last matching file. C<--no-match> inverts the test,
394to search for the first commit that adds files that match.
bf8fb529
NC
395
396The remaining command line arguments are treated as glob patterns for files
397to match against. If none are specified, then they default as follows:
398
399=over 4
400
401=item *
77ae6092
NC
402
403If no I<target> is specified, the match is against all files in the
bf8fb529
NC
404repository (which is fast).
405
406=item *
407
408If a I<target> is specified, that target is built, and the match is against
409only the built files.
410
411=back
412
413Treating the command line arguments as glob patterns should not cause
414problems, as the perl distribution has never shipped or built files with
415names that contain characters which are globbing metacharacters.
416
417Anything which is not a readable file is ignored, instead of generating an
418error. (If you want an error, run C<grep> or C<ack> as a test case). This
419permits one to easily search in a file that changed its name. For example:
420
421 .../Porting/bisect.pl --match 'Pod.*Functions' 'pod/buildtoc*'
77ae6092 422
66b521dd
NC
423C<--no-match ...> is implemented as C<--expect-fail --match ...>
424
77ae6092
NC
425=item *
426
54c7e1f0
NC
427--valgrind
428
429Run the test program under C<valgrind>. If you need to test for memory
430errors when parsing invalid programs, the default parser fail exit code of
431255 will always override C<valgrind>, so try putting the test case invalid
432code inside a I<string> C<eval>, so that the perl interpreter will exit with 0.
433(Be sure to check the output of $@, to avoid missing mistakes such as
434unintended C<eval> failures due to incorrect C<@INC>)
435
436Specifically, this option prepends C<valgrind> C<--error-exitcode=124> to
437the command line that runs the testcase, to cause valgrind to exit non-zero
438if it detects errors, with the assumption that the test program itself
439always exits with zero. If you require more flexibility than this, either
440specify your C<valgrind> invocation explicitly as part of the test case, or
441use a wrapper script to control the command line or massage the exit codes.
442
443=item *
444
77ae6092
NC
445--test-build
446
447Test that the build completes, without running any test case.
448
449By default, if the build for the desired I<target> fails to complete,
450F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
451being that one wants to find a commit which changed state "builds && passes"
452to "builds && fails". If instead one is interested in which commit broke the
453build (possibly for particular F<Configure> options), use I<--test-build>
454to treat a build failure as a failure, not a "skip".
455
b4f0ec5f
NC
456Often this option isn't as useful as it first seems, because I<any> build
457failure will be reported to C<git bisect> as a failure, not just the failure
458that you're interested in. Generally, to debug a particular problem, it's
459more useful to use a I<target> that builds properly at the point of interest,
460and then a test case that runs C<make>. For example:
461
462 .../Porting/bisect.pl --start=perl-5.000 --end=perl-5.002 \
463 --expect-fail --force-manifest --target=miniperl make perl
464
facd1b88
NC
465will find the first revision capable of building L<DynaLoader> and then
466F<perl>, without becoming confused by revisions where F<miniperl> won't
b4f0ec5f
NC
467even link.
468
77ae6092
NC
469=item *
470
b4f0ec5f
NC
471--force-manifest
472
77ae6092
NC
473By default, a build will "skip" if any files listed in F<MANIFEST> are not
474present. Usually this is useful, as it avoids false-failures. However, there
475are some long ranges of commits where listed files are missing, which can
476cause a bisect to abort because all that remain are skipped revisions.
477
478In these cases, particularly if the test case uses F<miniperl> and no modules,
479it may be more useful to force the build to continue, even if files
480F<MANIFEST> are missing.
481
482=item *
483
bfa52998
NC
484--force-regen
485
486Run C<make regen_headers> before building F<miniperl>. This may fix a build
487that otherwise would skip because the generated headers at that revision
488are stale. It's not the default because it conceals this error in the true
489state of such revisions.
490
491=item *
492
77ae6092
NC
493--expect-pass [0|1]
494
495C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
496
497=item *
498
1fdd0dcc
NC
499--timeout I<seconds>
500
501Run the testcase with the given timeout. If this is exceeded, kill it (and
502by default all its children), and treat it as a failure.
503
504=item *
505
b9dcd8de
NC
506--setpgrp
507
508Run the testcase in its own process group. Specifically, call C<setpgrp 0, 0>
1fdd0dcc
NC
509just before C<exec>-ing the user testcase. The default is not to set the
510process group, unless a timeout is used.
b9dcd8de
NC
511
512=item *
513
86905c1e
NC
514--all-fixups
515
516F<bisect-runner.pl> will minimally patch various files on a platform and
517version dependent basis to get the build to complete. Normally it defers
518doing this as long as possible - C<.SH> files aren't patched until after
519F<Configure> is run, and C<C> and C<XS> code isn't patched until after
520F<miniperl> is built. If C<--all-fixups> is specified, all the fixups are
521done before running C<Configure>. In rare cases adding this may cause a
522bisect to abort, because an inapplicable patch or other fixup is attempted
523for a revision which would usually have already I<skip>ed. If this happens,
524please report it as a bug, giving the OS and problem revision.
525
526=item *
527
df14fc13
NC
528--early-fixup file
529
530=item *
531
532--late-fixup file
533
534Specify a file containing a patch or other fixup for the source code. The
535action to take depends on the first line of the fixup file
536
537=over 4
538
539=item *
540
541C<#!perl>
542
543If the first line starts C<#!perl> then the file is run using C<$^X>
544
545=item *
546
547C<#!/absolute/path>
548
549If a shebang line is present the file is executed using C<system>
550
551=item *
552
553C<I<filename> =~ /I<pattern>/>
554
555=item *
556
557C<I<filename> !~ /I<pattern>/>
558
559If I<filename> does not exist then the fixup file's contents are ignored.
560Otherwise, for C<=~>, if it contains a line matching I<pattern>, then the
561file is fed to C<patch -p1> on standard input. For C<=~>, the patch is
562applied if no lines match the pattern.
563
564As the empty pattern in Perl is a special case (it matches the most recent
565sucessful match) which is not useful here, an the treatment of empty pattern
566is special-cased. C<I<filename> =~ //> applies the patch if filename is
567present. C<I<filename> !~ //> applies the patch if filename missing. This
568makes it easy to unconditionally apply patches to files, and to use a patch
569as a way of creating a new file.
570
571=item *
572
573Otherwise, the file is assumed to be a patch, and always applied.
574
575=back
576
577I<early-fixup>s are applied before F<./Configure> is run. I<late-fixup>s are
578applied just after F<./Configure> is run.
579
580These options can be specified more than once. I<file> is actually expanded
581as a glob pattern. Globs that do not match are errors, as are missing files.
582
583=item *
584
77ae6092
NC
585--no-clean
586
587Tell F<bisect-runner.pl> not to clean up after the build. This allows one
588to use F<bisect-runner.pl> to build the current particular perl revision for
589interactive testing, or for debugging F<bisect-runner.pl>.
590
591Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
592
593=item *
594
195ed8b1
NC
595--validate
596
f66c64b1
NC
597Test that all stable (.0) revisions can be built. By default, attempts to
598build I<blead>, then tagged stable releases in reverse order down to
599I<perl-5.002> (or I<perl5.005> on a case insensitive file system). Stops at
600the first failure, without cleaning the checkout. Use I<--start> to specify
601the earliest revision to test, I<--end> to specify the most recent. Useful
602for validating a new OS/CPU/compiler combination. For example
195ed8b1 603
fc4401c6 604 ../perl/Porting/bisect.pl --validate -le 'print "Hello from $]"'
195ed8b1 605
e2760528
NC
606If no testcase is specified, the default is to use F<t/TEST> to run
607F<t/base/*.t>
608
195ed8b1
NC
609=item *
610
77ae6092
NC
611--check-args
612
613Validate the options and arguments, and exit silently if they are valid.
614
615=item *
616
7cffc32d
NC
617--check-shebang
618
619Validate that the test case isn't an executable file with a
620C<#!/usr/bin/perl> line (or similar). As F<bisect-runner.pl> does B<not>
e3caab27
NC
621automatically prepend C<./perl> to the test case, a I<#!> line specifying an
622external F<perl> binary will cause the test case to always run with I<that>
623F<perl>, not the F<perl> built by the bisect runner. Likely this is not what
624you wanted. If your test case is actually a wrapper script to run other
7cffc32d
NC
625commands, you should run it with an explicit interpreter, to be clear. For
626example, instead of C<../perl/Porting/bisect.pl ~/test/testcase.pl> you'd
627run C<../perl/Porting/bisect.pl /usr/bin/perl ~/test/testcase.pl>
628
629=item *
630
02b83d1d
NC
631--gold
632
633Revision to use when checking out known-good recent versions of files,
634such as F<makedepend.SH>. F<bisect-runner.pl> defaults this to I<blead>,
635but F<bisect.pl> will default it to the most recent stable release.
636
637=item *
638
77ae6092
NC
639--usage
640
641=item *
642
643--help
644
645=item *
646
647-?
648
649Display the usage information and exit.
650
651=back
652
653=cut
654
f6647108
NC
655# Ensure we always exit with 255, to cause git bisect to abort.
656sub croak_255 {
657 my $message = join '', @_;
658 if ($message =~ /\n\z/) {
659 print STDERR $message;
660 } else {
661 my (undef, $file, $line) = caller 1;
662 print STDERR "@_ at $file line $line\n";
663 }
664 exit 255;
665}
666
667sub die_255 {
668 croak_255(@_);
669}
670
671die_255("$0: Can't build $target")
672 if defined $target && !grep {@targets} $target;
6a8dbfd7 673
df14fc13
NC
674foreach my $phase (qw(early late)) {
675 next unless $options{"$phase-fixup"};
676 my $bail_out;
677 require File::Glob;
678 my @expanded;
679 foreach my $glob (@{$options{"$phase-fixup"}}) {
680 my @got = File::Glob::bsd_glob($glob);
681 push @expanded, @got ? @got : $glob;
682 }
683 @expanded = sort @expanded;
684 $options{"$phase-fixup"} = \@expanded;
685 foreach (@expanded) {
686 unless (-f $_) {
687 print STDERR "$phase-fixup '$_' is not a readable file\n";
688 ++$bail_out;
689 }
690 }
691 exit 255 if $bail_out;
692}
693
8f13c642
NC
694unless (exists $defines{cc}) {
695 # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
c34d8429 696 # confusing.
8f13c642
NC
697 # FIXME - really it should be replaced with a proper test of
698 # "can we build something?" and a helpful diagnostic if we can't.
699 # For now, simply move it here.
c34d8429 700 $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
8f13c642
NC
701}
702
0bc550ba 703my $j = $options{jobs} ? "-j$options{jobs}" : '';
6a8dbfd7 704
32ffe018
NC
705if (exists $options{make}) {
706 if (!exists $defines{make}) {
707 $defines{make} = $options{make};
708 }
709} else {
710 $options{make} = 'make';
711}
712
0142f0ce
NC
713# Sadly, however hard we try, I don't think that it will be possible to build
714# modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
715# which updated to MakeMaker 3.7, which changed from using a hard coded ld
716# in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
717
69bf9aba
NC
718sub open_or_die {
719 my $file = shift;
720 my $mode = @_ ? shift : '<';
f6647108 721 open my $fh, $mode, $file or croak_255("Can't open $file: $!");
69bf9aba
NC
722 ${*$fh{SCALAR}} = $file;
723 return $fh;
724}
725
726sub close_or_die {
727 my $fh = shift;
728 return if close $fh;
f6647108
NC
729 croak_255("Can't close: $!") unless ref $fh eq 'GLOB';
730 croak_255("Can't close ${*$fh{SCALAR}}: $!");
69bf9aba
NC
731}
732
d953d40d
NC
733sub system_or_die {
734 my $command = '</dev/null ' . shift;
f6647108 735 system($command) and croak_255("'$command' failed, \$!=$!, \$?=$?");
d953d40d
NC
736}
737
12641c3b
NC
738sub run_with_options {
739 my $options = shift;
740 my $name = $options->{name};
741 $name = "@_" unless defined $name;
742
1fdd0dcc
NC
743 my $setgrp = $options->{setpgrp};
744 if ($options->{timeout}) {
745 # Unless you explicitly disabled it on the commandline, set it:
746 $setgrp = 1 unless defined $setgrp;
747 }
12641c3b
NC
748 my $pid = fork;
749 die_255("Can't fork: $!") unless defined $pid;
750 if (!$pid) {
751 if (exists $options->{stdin}) {
752 open STDIN, '<', $options->{stdin}
1fdd0dcc 753 or die "Can't open STDIN from $options->{stdin}: $!";
12641c3b 754 }
1fdd0dcc 755 if ($setgrp) {
b9dcd8de
NC
756 setpgrp 0, 0
757 or die "Can't setpgrp 0, 0: $!";
758 }
12641c3b
NC
759 { exec @_ };
760 die_255("Failed to start $name: $!");
761 }
1fdd0dcc
NC
762 my $start;
763 if ($options->{timeout}) {
764 require Errno;
765 require POSIX;
766 die_255("No POSIX::WNOHANG")
767 unless &POSIX::WNOHANG;
768 $start = time;
769 $SIG{ALRM} = sub {
770 my $victim = $setgrp ? -$pid : $pid;
771 my $delay = 1;
772 kill 'TERM', $victim;
773 waitpid(-1, &POSIX::WNOHANG);
774 while (kill 0, $victim) {
775 sleep $delay;
776 waitpid(-1, &POSIX::WNOHANG);
777 $delay *= 2;
778 if ($delay > 8) {
779 if (kill 'KILL', $victim) {
780 print STDERR "$0: Had to kill 'KILL', $victim\n"
781 } elsif (! $!{ESRCH}) {
782 print STDERR "$0: kill 'KILL', $victim failed: $!\n";
783 }
784 last;
785 }
786 }
787 report_and_exit(0, 'No timeout', 'Timeout', "when running $name");
788 };
789 alarm $options->{timeout};
790 }
12641c3b 791 waitpid $pid, 0
1fdd0dcc
NC
792 or die_255("wait for $name, pid $pid failed: $!");
793 alarm 0;
794 if ($options->{timeout}) {
795 my $elapsed = time - $start;
796 if ($elapsed / $options->{timeout} > 0.8) {
797 print STDERR "$0: Beware, took $elapsed seconds of $options->{timeout} permitted to run $name\n";
798 }
799 }
12641c3b
NC
800 return $?;
801}
802
6a8dbfd7
NC
803sub extract_from_file {
804 my ($file, $rx, $default) = @_;
69bf9aba 805 my $fh = open_or_die($file);
6a8dbfd7
NC
806 while (<$fh>) {
807 my @got = $_ =~ $rx;
808 return wantarray ? @got : $got[0]
809 if @got;
810 }
811 return $default if defined $default;
812 return;
813}
814
c59e8fd6
NC
815sub edit_file {
816 my ($file, $munger) = @_;
817 local $/;
69bf9aba 818 my $fh = open_or_die($file);
c59e8fd6 819 my $orig = <$fh>;
f6647108 820 die_255("Can't read $file: $!") unless defined $orig && close $fh;
c59e8fd6
NC
821 my $new = $munger->($orig);
822 return if $new eq $orig;
69bf9aba 823 $fh = open_or_die($file, '>');
f6647108 824 print $fh $new or die_255("Can't print to $file: $!");
69bf9aba 825 close_or_die($fh);
c59e8fd6
NC
826}
827
6fe55cbd
NC
828# AIX supplies a pre-historic patch program, which certainly predates Linux
829# and is probably older than NT. It can't cope with unified diffs. Meanwhile,
830# it's hard enough to get git diff to output context diffs, let alone git show,
831# and nearly all the patches embedded here are unified. So it seems that the
832# path of least resistance is to convert unified diffs to context diffs:
833
834sub process_hunk {
835 my ($from_out, $to_out, $has_from, $has_to, $delete, $add) = @_;
836 ++$$has_from if $delete;
837 ++$$has_to if $add;
838
839 if ($delete && $add) {
840 $$from_out .= "! $_\n" foreach @$delete;
841 $$to_out .= "! $_\n" foreach @$add;
842 } elsif ($delete) {
843 $$from_out .= "- $_\n" foreach @$delete;
844 } elsif ($add) {
845 $$to_out .= "+ $_\n" foreach @$add;
846 }
847}
848
849# This isn't quite general purpose, as it can't cope with
850# '\ No newline at end of file'
851sub ud2cd {
852 my $diff_in = shift;
853 my $diff_out = '';
854
855 # Stuff before the diff
856 while ($diff_in =~ s/\A(?!\*\*\* )(?!--- )([^\n]*\n?)//ms && length $1) {
857 $diff_out .= $1;
858 }
859
860 if (!length $diff_in) {
f6647108 861 die_255("That didn't seem to be a diff");
6fe55cbd
NC
862 }
863
864 if ($diff_in =~ /\A\*\*\* /ms) {
865 warn "Seems to be a context diff already\n";
866 return $diff_out . $diff_in;
867 }
868
869 # Loop for files
870 FILE: while (1) {
871 if ($diff_in =~ s/\A((?:diff |index )[^\n]+\n)//ms) {
872 $diff_out .= $1;
873 next;
874 }
875 if ($diff_in !~ /\A--- /ms) {
876 # Stuff after the diff;
877 return $diff_out . $diff_in;
878 }
879 $diff_in =~ s/\A([^\n]+\n?)//ms;
880 my $line = $1;
f6647108 881 die_255("Can't parse '$line'") unless $line =~ s/\A--- /*** /ms;
6fe55cbd
NC
882 $diff_out .= $line;
883 $diff_in =~ s/\A([^\n]+\n?)//ms;
884 $line = $1;
f6647108 885 die_255("Can't parse '$line'") unless $line =~ s/\A\+\+\+ /--- /ms;
6fe55cbd
NC
886 $diff_out .= $line;
887
888 # Loop for hunks
889 while (1) {
890 next FILE
891 unless $diff_in =~ s/\A\@\@ (-([0-9]+),([0-9]+) \+([0-9]+),([0-9]+)) \@\@[^\n]*\n?//;
892 my ($hunk, $from_start, $from_count, $to_start, $to_count)
893 = ($1, $2, $3, $4, $5);
894 my $from_end = $from_start + $from_count - 1;
895 my $to_end = $to_start + $to_count - 1;
896 my ($from_out, $to_out, $has_from, $has_to, $add, $delete);
897 while (length $diff_in && ($from_count || $to_count)) {
f6647108
NC
898 die_255("Confused in $hunk")
899 unless $diff_in =~ s/\A([^\n]*)\n//ms;
6fe55cbd
NC
900 my $line = $1;
901 $line = ' ' unless length $line;
902 if ($line =~ /^ .*/) {
903 process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
904 $delete, $add);
905 undef $delete;
906 undef $add;
907 $from_out .= " $line\n";
908 $to_out .= " $line\n";
909 --$from_count;
910 --$to_count;
911 } elsif ($line =~ /^-(.*)/) {
912 push @$delete, $1;
913 --$from_count;
914 } elsif ($line =~ /^\+(.*)/) {
915 push @$add, $1;
916 --$to_count;
917 } else {
f6647108 918 die_255("Can't parse '$line' as part of hunk $hunk");
6fe55cbd
NC
919 }
920 }
921 process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
922 $delete, $add);
f6647108 923 die_255("No lines in hunk $hunk")
6fe55cbd 924 unless length $from_out || length $to_out;
f6647108 925 die_255("No changes in hunk $hunk")
6fe55cbd
NC
926 unless $has_from || $has_to;
927 $diff_out .= "***************\n";
928 $diff_out .= "*** $from_start,$from_end ****\n";
929 $diff_out .= $from_out if $has_from;
930 $diff_out .= "--- $to_start,$to_end ----\n";
931 $diff_out .= $to_out if $has_to;
932 }
933 }
934}
935
936{
937 my $use_context;
938
939 sub placate_patch_prog {
940 my $patch = shift;
941
942 if (!defined $use_context) {
943 my $version = `patch -v 2>&1`;
f6647108 944 die_255("Can't run `patch -v`, \$?=$?, bailing out")
6fe55cbd
NC
945 unless defined $version;
946 if ($version =~ /Free Software Foundation/) {
947 $use_context = 0;
948 } elsif ($version =~ /Header: patch\.c,v.*\blwall\b/) {
949 # The system patch is older than Linux, and probably older than
950 # Windows NT.
951 $use_context = 1;
ccb58ea9
NC
952 } elsif ($version =~ /Header: patch\.c,v.*\babhinav\b/) {
953 # Thank you HP. No, we have no idea *which* version this is:
954 # $Header: patch.c,v 76.1.1.2.1.3 2001/12/03 12:24:52 abhinav Exp $
955 $use_context = 1;
6fe55cbd
NC
956 } else {
957 # Don't know.
958 $use_context = 0;
959 }
960 }
961
962 return $use_context ? ud2cd($patch) : $patch;
963 }
964}
965
c59e8fd6 966sub apply_patch {
58a28a53
NC
967 my ($patch, $what, $files) = @_;
968 $what = 'patch' unless defined $what;
969 unless (defined $files) {
bff4c287 970 $patch =~ m!^--- [ab]/(\S+)\n\+\+\+ [ba]/\1!sm;
58a28a53
NC
971 $files = " $1";
972 }
6fe55cbd 973 my $patch_to_use = placate_patch_prog($patch);
f6647108 974 open my $fh, '|-', 'patch', '-p1' or die_255("Can't run patch: $!");
6fe55cbd 975 print $fh $patch_to_use;
5fceabf3
NC
976 return if close $fh;
977 print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
56a20cc1
NC
978 print STDERR "\nConverted to a context diff <<'EOCONTEXT'\n${patch_to_use}EOCONTEXT\n"
979 if $patch_to_use ne $patch;
f6647108 980 die_255("Can't $what$files: $?, $!");
c59e8fd6
NC
981}
982
4e540a4e
NC
983sub apply_commit {
984 my ($commit, @files) = @_;
58a28a53
NC
985 my $patch = `git show $commit @files`;
986 if (!defined $patch) {
f6647108
NC
987 die_255("Can't get commit $commit for @files: $?") if @files;
988 die_255("Can't get commit $commit: $?");
58a28a53
NC
989 }
990 apply_patch($patch, "patch $commit", @files ? " for @files" : '');
4e540a4e
NC
991}
992
993sub revert_commit {
994 my ($commit, @files) = @_;
58a28a53
NC
995 my $patch = `git show -R $commit @files`;
996 if (!defined $patch) {
f6647108
NC
997 die_255("Can't get revert commit $commit for @files: $?") if @files;
998 die_255("Can't get revert commit $commit: $?");
58a28a53
NC
999 }
1000 apply_patch($patch, "revert $commit", @files ? " for @files" : '');
4e540a4e
NC
1001}
1002
91ad6f8a
NC
1003sub checkout_file {
1004 my ($file, $commit) = @_;
02b83d1d 1005 $commit ||= $options{gold} || 'blead';
91ad6f8a 1006 system "git show $commit:$file > $file </dev/null"
f6647108 1007 and die_255("Could not extract $file at revision $commit");
91ad6f8a
NC
1008}
1009
7cffc32d
NC
1010sub check_shebang {
1011 my $file = shift;
1012 return unless -e $file;
e3caab27
NC
1013 my $fh = open_or_die($file);
1014 my $line = <$fh>;
1015 return if $line =~ $run_with_our_perl;
7cffc32d 1016 if (!-x $file) {
f6647108 1017 die_255("$file is not executable.
7cffc32d
NC
1018system($file, ...) is always going to fail.
1019
f6647108 1020Bailing out");
7cffc32d 1021 }
7cffc32d 1022 return unless $line =~ m{\A#!(/\S+/perl\S*)\s};
f6647108 1023 die_255("$file will always be run by $1
7cffc32d
NC
1024It won't be tested by the ./perl we build.
1025If you intended to run it with that perl binary, please change your
1026test case to
1027
1028 $1 @ARGV
1029
1030If you intended to test it with the ./perl we build, please change your
1031test case to
1032
1033 ./perl -Ilib @ARGV
1034
1035[You may also need to add -- before ./perl to prevent that -Ilib as being
1036parsed as an argument to bisect.pl]
1037
f6647108 1038Bailing out");
7cffc32d
NC
1039}
1040
ab4a15f9 1041sub clean {
f4800c99 1042 if ($options{clean}) {
ab4a15f9
NC
1043 # Needed, because files that are build products in this checked out
1044 # version might be in git in the next desired version.
9da8cb0a 1045 system 'git clean -dxf </dev/null';
ab4a15f9
NC
1046 # Needed, because at some revisions the build alters checked out files.
1047 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
9da8cb0a 1048 system 'git reset --hard HEAD </dev/null';
ab4a15f9
NC
1049 }
1050}
1051
1052sub skip {
1053 my $reason = shift;
1054 clean();
1055 warn "skipping - $reason";
1056 exit 125;
1057}
1058
f1050811 1059sub report_and_exit {
37c43f74 1060 my ($good, $pass, $fail, $desc) = @_;
f1050811
NC
1061
1062 clean();
1063
37c43f74
NC
1064 my $got = ($options{'expect-pass'} ? $good : !$good) ? 'good' : 'bad';
1065 if ($good) {
f1050811 1066 print "$got - $pass $desc\n";
37c43f74
NC
1067 } else {
1068 print "$got - $fail $desc\n";
f1050811
NC
1069 }
1070
1071 exit($got eq 'bad');
1072}
1073
b518173e 1074sub run_report_and_exit {
1fdd0dcc
NC
1075 my $ret = run_with_options({setprgp => $options{setpgrp},
1076 timeout => $options{timeout},
1077 }, @_);
37c43f74 1078 report_and_exit(!$ret, 'zero exit from', 'non-zero exit from', "@_");
b518173e
NC
1079}
1080
0afef97d 1081sub match_and_exit {
bf8fb529 1082 my ($target, @globs) = @_;
0afef97d
NC
1083 my $matches = 0;
1084 my $re = qr/$match/;
1085 my @files;
1086
bf8fb529
NC
1087 if (@globs) {
1088 require File::Glob;
1089 foreach (sort map { File::Glob::bsd_glob($_)} @globs) {
1090 if (!-f $_ || !-r _) {
1091 warn "Skipping matching '$_' as it is not a readable file\n";
1092 } else {
1093 push @files, $_;
1094 }
1095 }
1096 } else {
0afef97d
NC
1097 local $/ = "\0";
1098 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
1099 chomp @files;
1100 }
1101
1102 foreach my $file (@files) {
69bf9aba 1103 my $fh = open_or_die($file);
0afef97d
NC
1104 while (<$fh>) {
1105 if ($_ =~ $re) {
1106 ++$matches;
1107 if (tr/\t\r\n -~\200-\377//c) {
1108 print "Binary file $file matches\n";
1109 } else {
1110 $_ .= "\n" unless /\n\z/;
1111 print "$file: $_";
1112 }
1113 }
1114 }
69bf9aba 1115 close_or_die($fh);
0afef97d 1116 }
37c43f74 1117 report_and_exit($matches,
0afef97d
NC
1118 $matches == 1 ? '1 match for' : "$matches matches for",
1119 'no matches for', $match);
1120}
1121
6a8dbfd7 1122# Not going to assume that system perl is yet new enough to have autodie
d953d40d 1123system_or_die('git clean -dxf');
6a8dbfd7 1124
0afef97d 1125if (!defined $target) {
bf8fb529 1126 match_and_exit(undef, @ARGV) if $match;
0afef97d 1127 $target = 'test_prep';
3f468b94
NC
1128} elsif ($target eq 'none') {
1129 match_and_exit(undef, @ARGV) if $match;
1130 run_report_and_exit(@ARGV);
bc96a05a
NC
1131}
1132
4b081584
NC
1133skip('no Configure - is this the //depot/perlext/Compiler branch?')
1134 unless -f 'Configure';
1135
1f1c8096
NC
1136my $case_insensitive;
1137{
1138 my ($dev_C, $ino_C) = stat 'Configure';
f6647108 1139 die_255("Could not stat Configure: $!") unless defined $dev_C;
1f1c8096
NC
1140 my ($dev_c, $ino_c) = stat 'configure';
1141 ++$case_insensitive
1142 if defined $dev_c && $dev_C == $dev_c && $ino_C == $ino_c;
1143}
1144
dbcdc176
NC
1145# This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
1146my $major
1147 = extract_from_file('patchlevel.h',
1148 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
1149 0);
1150
fbaecb45
NC
1151my $unfixable_db_file;
1152
1153if ($major < 10
1154 && !extract_from_file('ext/DB_File/DB_File.xs',
1155 qr!^#else /\* Berkeley DB Version > 2 \*/$!)) {
1156 # This DB_File.xs is really too old to patch up.
1157 # Skip DB_File, unless we're invoked with an explicit -Unoextensions
1158 if (!exists $defines{noextensions}) {
1159 $defines{noextensions} = 'DB_File';
1160 } elsif (defined $defines{noextensions}) {
1161 $defines{noextensions} .= ' DB_File';
1162 }
1163 ++$unfixable_db_file;
1164}
1165
750ce942
NC
1166patch_Configure();
1167patch_hints();
86905c1e
NC
1168if ($options{'all-fixups'}) {
1169 patch_SH();
1170 patch_C();
1171 patch_ext();
1172}
df14fc13 1173apply_fixups($options{'early-fixup'});
750ce942 1174
6a8dbfd7
NC
1175# if Encode is not needed for the test, you can speed up the bisect by
1176# excluding it from the runs with -Dnoextensions=Encode
1177# ccache is an easy win. Remove it if it causes problems.
6a8dbfd7
NC
1178# Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
1179# to true in hints/linux.sh
1180# On dromedary, from that point on, Configure (by default) fails to find any
1181# libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
1182# versioned libraries. Without -lm, the build fails.
1183# Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
1184# until commit faae14e6e968e1c0 adds it to the hints.
1185# However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
1186# because it will spot versioned libraries, pass them to the compiler, and then
1187# bail out pretty early on. Configure won't let us override libswanted, but it
1188# will let us override the entire libs list.
1189
40c94856
NC
1190foreach (@{$options{A}}) {
1191 push @paths, $1 if /^libpth=(.*)/s;
1192}
1193
6a8dbfd7
NC
1194unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
1195 # Before 1cfa4ec74d4933da, so force the libs list.
1196
1197 my @libs;
1198 # This is the current libswanted list from Configure, less the libs removed
1199 # by current hints/linux.sh
1200 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld
1201 ld sun m crypt sec util c cposix posix ucb BSD)) {
1202 foreach my $dir (@paths) {
40c94856
NC
1203 # Note the wonderful consistency of dot-or-not in the config vars:
1204 next unless -f "$dir/lib$lib.$Config{dlext}"
1205 || -f "$dir/lib$lib$Config{lib_ext}";
6a8dbfd7
NC
1206 push @libs, "-l$lib";
1207 last;
1208 }
1209 }
390a69a9 1210 $defines{libs} = \@libs unless exists $defines{libs};
6a8dbfd7
NC
1211}
1212
390a69a9
NC
1213$defines{usenm} = undef
1214 if $major < 2 && !exists $defines{usenm};
0142f0ce 1215
05ec8abc
NC
1216my ($missing, $created_dirs);
1217($missing, $created_dirs) = force_manifest()
1218 if $options{'force-manifest'};
67382a3b 1219
af7c500f 1220my @ARGS = '-dEs';
390a69a9
NC
1221foreach my $key (sort keys %defines) {
1222 my $val = $defines{$key};
1223 if (ref $val) {
1224 push @ARGS, "-D$key=@$val";
1225 } elsif (!defined $val) {
1226 push @ARGS, "-U$key";
1227 } elsif (!length $val) {
1228 push @ARGS, "-D$key";
1229 } else {
1230 $val = "" if $val eq "\0";
1231 push @ARGS, "-D$key=$val";
1232 }
1233}
1234push @ARGS, map {"-A$_"} @{$options{A}};
1235
12641c3b
NC
1236# If a file in MANIFEST is missing, Configure asks if you want to
1237# continue (the default being 'n'). With stdin closed or /dev/null,
1238# it exits immediately and the check for config.sh below will skip.
1239# Without redirecting stdin, the commands called will attempt to read from
1240# stdin (and thus effectively hang)
1241run_with_options({stdin => '/dev/null', name => 'Configure'},
1242 './Configure', @ARGS);
6a8dbfd7 1243
86905c1e 1244patch_SH() unless $options{'all-fixups'};
df14fc13 1245apply_fixups($options{'late-fixup'});
bb723266 1246
af7c500f 1247if (-f 'config.sh') {
05ec8abc
NC
1248 # Emulate noextensions if Configure doesn't support it.
1249 fake_noextensions()
1250 if $major < 10 && $defines{noextensions};
d953d40d 1251 system_or_die('./Configure -S');
af7c500f
NC
1252}
1253
0afef97d 1254if ($target =~ /config\.s?h/) {
bf8fb529 1255 match_and_exit($target, @ARGV) if $match && -f $target;
37c43f74 1256 report_and_exit(-f $target, 'could build', 'could not build', $target)
30a13282
NC
1257 if $options{'test-build'};
1258
18815322
NC
1259 skip("could not build $target") unless -f $target;
1260
b518173e 1261 run_report_and_exit(@ARGV);
dd4e46d7
NC
1262} elsif (!-f 'config.sh') {
1263 # Skip if something went wrong with Configure
1264
1265 skip('could not build config.sh');
1266}
6a8dbfd7 1267
05ec8abc
NC
1268force_manifest_cleanup($missing, $created_dirs)
1269 if $missing;
67382a3b 1270
bfa52998
NC
1271if($options{'force-regen'}
1272 && extract_from_file('Makefile', qr/\bregen_headers\b/)) {
1273 # regen_headers was added in e50aee73b3d4c555, patch.1m for perl5.001
1274 # It's not worth faking it for earlier revisions.
d953d40d 1275 system_or_die('make regen_headers');
bfa52998
NC
1276}
1277
86905c1e
NC
1278unless ($options{'all-fixups'}) {
1279 patch_C();
1280 patch_ext();
1281}
750ce942
NC
1282
1283# Parallel build for miniperl is safe
32ffe018 1284system "$options{make} $j miniperl </dev/null";
750ce942 1285
6c2d645d
NC
1286# This is the file we expect make to create
1287my $expected_file = $target =~ /^test/ ? 't/perl'
750ce942
NC
1288 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
1289 : $target;
6c2d645d
NC
1290# This is the target we tell make to build in order to get $expected_file
1291my $real_target = $target eq 'Fcntl' ? $expected_file : $target;
750ce942
NC
1292
1293if ($target ne 'miniperl') {
1294 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
1295 $j = '' if $major < 10;
1296
1297 if ($real_target eq 'test_prep') {
1298 if ($major < 8) {
1299 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
1300 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
1301 # earlier than that, just make test. It will be fast enough.
1302 $real_target = extract_from_file('Makefile.SH',
1303 qr/^(test[-_]prep):/,
1304 'test');
1305 }
1306 }
1307
32ffe018 1308 system "$options{make} $j $real_target </dev/null";
6f8c21fa
NC
1309}
1310
6c2d645d
NC
1311my $expected_file_found = $expected_file =~ /perl$/
1312 ? -x $expected_file : -r $expected_file;
750ce942 1313
63af1e78
NC
1314if ($expected_file_found && $expected_file eq 't/perl') {
1315 # Check that it isn't actually pointing to ../miniperl, which will happen
1316 # if the sanity check ./miniperl -Ilib -MExporter -e '<?>' fails, and
1317 # Makefile tries to run minitest.
1318
1319 # Of course, helpfully sometimes it's called ../perl, other times .././perl
1320 # and who knows if that list is exhaustive...
1321 my ($dev0, $ino0) = stat 't/perl';
1322 my ($dev1, $ino1) = stat 'perl';
1323 unless (defined $dev0 && defined $dev1 && $dev0 == $dev1 && $ino0 == $ino1) {
1324 undef $expected_file_found;
1325 my $link = readlink $expected_file;
1326 warn "'t/perl' => '$link', not 'perl'";
f6647108 1327 die_255("Could not realink t/perl: $!") unless defined $link;
63af1e78
NC
1328 }
1329}
1330
750ce942 1331if ($options{'test-build'}) {
37c43f74 1332 report_and_exit($expected_file_found, 'could build', 'could not build',
750ce942 1333 $real_target);
6c2d645d 1334} elsif (!$expected_file_found) {
750ce942 1335 skip("could not build $real_target");
f50dca98
NC
1336}
1337
bf8fb529 1338match_and_exit($real_target, @ARGV) if $match;
750ce942
NC
1339
1340if (defined $options{'one-liner'}) {
1341 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
fc4401c6 1342 unshift @ARGV, '-e', $options{'one-liner'};
529d2ac2
NC
1343 foreach (qw(c l w)) {
1344 unshift @ARGV, "-$_" if $options{$_};
1345 }
fc4401c6 1346 unshift @ARGV, "./$exe", '-Ilib';
f50dca98
NC
1347}
1348
e3caab27
NC
1349if (-f $ARGV[0]) {
1350 my $fh = open_or_die($ARGV[0]);
1351 my $line = <$fh>;
1352 unshift @ARGV, $1, '-Ilib'
1353 if $line =~ $run_with_our_perl;
1354}
1355
54c7e1f0
NC
1356if ($options{valgrind}) {
1357 # Turns out to be too confusing to use an optional argument with the path
1358 # of the valgrind binary, as if --valgrind takes an optional argument,
1359 # then specifying it as the last option eats the first part of the testcase.
1360 # ie this: .../bisect.pl --valgrind testcase
1361 # is treated as --valgrind=testcase and as there is no test case given,
1362 # it's an invalid commandline, bailing out with the usage message.
1363
1364 # Currently, the test script can't signal a skip with 125, so anything
1365 # non-zero would do. But to keep that option open in future, use 124
1366 unshift @ARGV, 'valgrind', '--error-exitcode=124';
1367}
1368
750ce942
NC
1369# This is what we came here to run:
1370
1371if (exists $Config{ldlibpthname}) {
1372 require Cwd;
1373 my $varname = $Config{ldlibpthname};
1374 my $cwd = Cwd::getcwd();
1375 if (defined $ENV{$varname}) {
1376 $ENV{$varname} = $cwd . $Config{path_sep} . $ENV{$varname};
1377 } else {
1378 $ENV{$varname} = $cwd;
f50dca98 1379 }
750ce942
NC
1380}
1381
b518173e 1382run_report_and_exit(@ARGV);
750ce942 1383
f2f0a0ff
NC
1384############################################################################
1385#
05ec8abc 1386# Patching, editing and faking routines only below here.
f2f0a0ff
NC
1387#
1388############################################################################
1389
05ec8abc
NC
1390sub fake_noextensions {
1391 edit_file('config.sh', sub {
1392 my @lines = split /\n/, shift;
1393 my @ext = split /\s+/, $defines{noextensions};
1394 foreach (@lines) {
1395 next unless /^extensions=/ || /^dynamic_ext/;
1396 foreach my $ext (@ext) {
1397 s/\b$ext( )?\b/$1/;
1398 }
1399 }
1400 return join "\n", @lines;
1401 });
1402}
1403
1404sub force_manifest {
1405 my (@missing, @created_dirs);
1406 my $fh = open_or_die('MANIFEST');
1407 while (<$fh>) {
1408 next unless /^(\S+)/;
1409 # -d is special case needed (at least) between 27332437a2ed1941 and
1410 # bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread
1411 push @missing, $1
1412 unless -f $1 || -d $1;
1413 }
1414 close_or_die($fh);
1415
1416 foreach my $pathname (@missing) {
1417 my @parts = split '/', $pathname;
1418 my $leaf = pop @parts;
1419 my $path = '.';
1420 while (@parts) {
1421 $path .= '/' . shift @parts;
1422 next if -d $path;
f6647108 1423 mkdir $path, 0700 or die_255("Can't create $path: $!");
05ec8abc
NC
1424 unshift @created_dirs, $path;
1425 }
1426 $fh = open_or_die($pathname, '>');
1427 close_or_die($fh);
f6647108 1428 chmod 0, $pathname or die_255("Can't chmod 0 $pathname: $!");
05ec8abc
NC
1429 }
1430 return \@missing, \@created_dirs;
1431}
1432
1433sub force_manifest_cleanup {
1434 my ($missing, $created_dirs) = @_;
1435 # This is probably way too paranoid:
1436 my @errors;
1437 require Fcntl;
1438 foreach my $file (@$missing) {
1439 my (undef, undef, $mode, undef, undef, undef, undef, $size)
1440 = stat $file;
1441 if (!defined $mode) {
1442 push @errors, "Added file $file has been deleted by Configure";
1443 next;
1444 }
1445 if (Fcntl::S_IMODE($mode) != 0) {
1446 push @errors,
1447 sprintf 'Added file %s had mode changed by Configure to %03o',
1448 $file, $mode;
1449 }
1450 if ($size != 0) {
1451 push @errors,
1452 "Added file $file had sized changed by Configure to $size";
1453 }
f6647108 1454 unlink $file or die_255("Can't unlink $file: $!");
05ec8abc
NC
1455 }
1456 foreach my $dir (@$created_dirs) {
f6647108 1457 rmdir $dir or die_255("Can't rmdir $dir: $!");
05ec8abc
NC
1458 }
1459 skip("@errors")
1460 if @errors;
1461}
1462
750ce942
NC
1463sub patch_Configure {
1464 if ($major < 1) {
1465 if (extract_from_file('Configure',
1466 qr/^\t\t\*=\*\) echo "\$1" >> \$optdef;;$/)) {
1467 # This is " Spaces now allowed in -D command line options.",
1468 # part of commit ecfc54246c2a6f42
1469 apply_patch(<<'EOPATCH');
1470diff --git a/Configure b/Configure
1471index 3d3b38d..78ffe16 100755
1472--- a/Configure
1473+++ b/Configure
1474@@ -652,7 +777,8 @@ while test $# -gt 0; do
1475 echo "$me: use '-U symbol=', not '-D symbol='." >&2
1476 echo "$me: ignoring -D $1" >&2
1477 ;;
1478- *=*) echo "$1" >> $optdef;;
1479+ *=*) echo "$1" | \
1480+ sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
1481 *) echo "$1='define'" >> $optdef;;
1482 esac
1483 shift
1484EOPATCH
1485 }
1486
1487 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
1488 # Configure's original simple "grep" for d_namlen falls foul of the
1489 # approach taken by the glibc headers:
1490 # #ifdef _DIRENT_HAVE_D_NAMLEN
1491 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
1492 #
1493 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
1494 # This is also part of commit ecfc54246c2a6f42
1495 apply_patch(<<'EOPATCH');
1496diff --git a/Configure b/Configure
1497index 3d3b38d..78ffe16 100755
1498--- a/Configure
1499+++ b/Configure
1500@@ -3935,7 +4045,8 @@ $rm -f try.c
1501
1502 : see if the directory entry stores field length
1503 echo " "
1504-if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
1505+$cppstdin $cppflags $cppminus < "$xinc" > try.c
1506+if $contains 'd_namlen' try.c >/dev/null 2>&1; then
1507 echo "Good, your directory entry keeps length information in d_namlen." >&4
1508 val="$define"
1509 else
1510EOPATCH
1511 }
f50dca98 1512 }
750ce942
NC
1513
1514 if ($major < 2
1515 && !extract_from_file('Configure',
1516 qr/Try to guess additional flags to pick up local libraries/)) {
1517 my $mips = extract_from_file('Configure',
1518 qr!(''\) if (?:\./)?mips; then)!);
1519 # This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to
730ad6b9
DS
1520 # the ld flags if libraries are found there. It shifts the code to set
1521 # up libpth earlier, and then adds the code to add libpth entries to
750ce942
NC
1522 # ldflags
1523 # mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g
1524 apply_patch(sprintf <<'EOPATCH', $mips);
1525diff --git a/Configure b/Configure
1526index 53649d5..0635a6e 100755
1527--- a/Configure
1528+++ b/Configure
1529@@ -2749,6 +2749,52 @@ EOM
1530 ;;
1531 esac
f50dca98 1532
750ce942
NC
1533+: Set private lib path
1534+case "$plibpth" in
1535+'') if ./mips; then
1536+ plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
1537+ fi;;
1538+esac
1539+case "$libpth" in
1540+' ') dlist='';;
1541+'') dlist="$plibpth $glibpth";;
1542+*) dlist="$libpth";;
1543+esac
1544+
1545+: Now check and see which directories actually exist, avoiding duplicates
1546+libpth=''
1547+for xxx in $dlist
1548+do
1549+ if $test -d $xxx; then
1550+ case " $libpth " in
1551+ *" $xxx "*) ;;
1552+ *) libpth="$libpth $xxx";;
1553+ esac
1554+ fi
1555+done
1556+$cat <<'EOM'
1557+
1558+Some systems have incompatible or broken versions of libraries. Among
1559+the directories listed in the question below, please remove any you
1560+know not to be holding relevant libraries, and add any that are needed.
1561+Say "none" for none.
1562+
1563+EOM
1564+case "$libpth" in
1565+'') dflt='none';;
1566+*)
1567+ set X $libpth
1568+ shift
1569+ dflt=${1+"$@"}
1570+ ;;
1571+esac
1572+rp="Directories to use for library searches?"
1573+. ./myread
1574+case "$ans" in
1575+none) libpth=' ';;
1576+*) libpth="$ans";;
1577+esac
1578+
1579 : flags used in final linking phase
1580 case "$ldflags" in
1581 '') if ./venix; then
1582@@ -2765,6 +2811,23 @@ case "$ldflags" in
1583 ;;
1584 *) dflt="$ldflags";;
1585 esac
1586+
1587+: Possible local library directories to search.
1588+loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
1589+loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
1590+
1591+: Try to guess additional flags to pick up local libraries.
1592+for thislibdir in $libpth; do
1593+ case " $loclibpth " in
1594+ *" $thislibdir "*)
1595+ case "$dflt " in
1596+ "-L$thislibdir ") ;;
1597+ *) dflt="$dflt -L$thislibdir" ;;
1598+ esac
1599+ ;;
1600+ esac
1601+done
1602+
1603 echo " "
1604 rp="Any additional ld flags (NOT including libraries)?"
1605 . ./myread
1606@@ -2828,52 +2891,6 @@ n) echo "OK, that should do.";;
1607 esac
1608 $rm -f try try.* core
1609
1610-: Set private lib path
1611-case "$plibpth" in
1612-%s
1613- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
1614- fi;;
1615-esac
1616-case "$libpth" in
1617-' ') dlist='';;
1618-'') dlist="$plibpth $glibpth";;
1619-*) dlist="$libpth";;
1620-esac
1621-
1622-: Now check and see which directories actually exist, avoiding duplicates
1623-libpth=''
1624-for xxx in $dlist
1625-do
1626- if $test -d $xxx; then
1627- case " $libpth " in
1628- *" $xxx "*) ;;
1629- *) libpth="$libpth $xxx";;
1630- esac
1631- fi
1632-done
1633-$cat <<'EOM'
f50dca98 1634-
750ce942
NC
1635-Some systems have incompatible or broken versions of libraries. Among
1636-the directories listed in the question below, please remove any you
1637-know not to be holding relevant libraries, and add any that are needed.
1638-Say "none" for none.
1639-
1640-EOM
1641-case "$libpth" in
1642-'') dflt='none';;
1643-*)
1644- set X $libpth
1645- shift
1646- dflt=${1+"$@"}
1647- ;;
1648-esac
1649-rp="Directories to use for library searches?"
1650-. ./myread
1651-case "$ans" in
1652-none) libpth=' ';;
1653-*) libpth="$ans";;
1654-esac
1655-
1656 : compute shared library extension
1657 case "$so" in
1658 '')
f50dca98
NC
1659EOPATCH
1660 }
686af304 1661
54591b5a
NC
1662 if ($major == 4 && extract_from_file('Configure', qr/^d_gethbynam=/)) {
1663 # Fixes a bug introduced in 4599a1dedd47b916
1664 apply_commit('3cbc818d1d0ac470');
1665 }
1666
1667 if ($major == 4 && extract_from_file('Configure',
1668 qr/gethbadd_addr_type=`echo \$gethbadd_addr_type/)) {
1669 # Fixes a bug introduced in 3fd537d4b944bc7a
1670 apply_commit('6ff9219da6cf8cfd');
1671 }
1672
1673 if ($major == 4 && extract_from_file('Configure',
1674 qr/^pthreads_created_joinable=/)) {
1675 # Fix for bug introduced in 52e1cb5ebf5e5a8c
1676 # Part of commit ce637636a41b2fef
1677 edit_file('Configure', sub {
1678 my $code = shift;
1679 $code =~ s{^pthreads_created_joinable=''}
1680 {d_pthreads_created_joinable=''}ms
1681 or die_255("Substitution failed");
1682 $code =~ s{^pthreads_created_joinable='\$pthreads_created_joinable'}
1683 {d_pthreads_created_joinable='\$d_pthreads_created_joinable'}ms
1684 or die_255("Substitution failed");
1685 return $code;
1686 });
1687 }
1688
750ce942
NC
1689 if ($major < 5 && extract_from_file('Configure',
1690 qr!if \$cc \$ccflags try\.c -o try >/dev/null 2>&1; then!)) {
1691 # Analogous to the more general fix of dfe9444ca7881e71
1692 # Without this flags such as -m64 may not be passed to this compile,
1693 # which results in a byteorder of '1234' instead of '12345678', which
1694 # can then cause crashes.
686af304 1695
750ce942
NC
1696 if (extract_from_file('Configure', qr/xxx_prompt=y/)) {
1697 # 8e07c86ebc651fe9 or later
1698 # ("This is my patch patch.1n for perl5.001.")
1699 apply_patch(<<'EOPATCH');
1700diff --git a/Configure b/Configure
1701index 62249dd..c5c384e 100755
1702--- a/Configure
1703+++ b/Configure
1704@@ -8247,7 +8247,7 @@ main()
1705 }
1706 EOCP
1707 xxx_prompt=y
1708- if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
1709+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
1710 dflt=`./try`
1711 case "$dflt" in
1712 [1-4][1-4][1-4][1-4]|12345678|87654321)
1713EOPATCH
1714 } else {
1715 apply_patch(<<'EOPATCH');
1716diff --git a/Configure b/Configure
1717index 53649d5..f1cd64a 100755
1718--- a/Configure
1719+++ b/Configure
1720@@ -6362,7 +6362,7 @@ main()
1721 printf("\n");
1722 }
1723 EOCP
1724- if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
1725+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 ; then
1726 dflt=`./try`
1727 case "$dflt" in
1728 ????|????????) echo "(The test program ran ok.)";;
1729EOPATCH
1730 }
1731 }
9a999a97 1732
750ce942
NC
1733 if ($major < 6 && !extract_from_file('Configure',
1734 qr!^\t-A\)$!)) {
1735 # This adds the -A option to Configure, which is incredibly useful
1736 # Effectively this is commits 02e93a22d20fc9a5, 5f83a3e9d818c3ad,
1737 # bde6b06b2c493fef, f7c3111703e46e0c and 2 lines of trailing whitespace
1738 # removed by 613d6c3e99b9decc, but applied at slightly different
1739 # locations to ensure a clean patch back to 5.000
1740 # Note, if considering patching to the intermediate revisions to fix
1741 # bugs in -A handling, f7c3111703e46e0c is from 2002, and hence
1742 # $major == 8
1743
1744 # To add to the fun, early patches add -K and -O options, and it's not
1745 # trivial to get patch to put the C<. ./posthint.sh> in the right place
1746 edit_file('Configure', sub {
1747 my $code = shift;
1748 $code =~ s/(optstr = ")([^"]+";\s*# getopt-style specification)/$1A:$2/
f6647108 1749 or die_255("Substitution failed");
750ce942
NC
1750 $code =~ s!^(: who configured the system)!
1751touch posthint.sh
1752. ./posthint.sh
2526f4b8 1753
750ce942 1754$1!ms
f6647108 1755 or die_255("Substitution failed");
750ce942
NC
1756 return $code;
1757 });
1758 apply_patch(<<'EOPATCH');
1759diff --git a/Configure b/Configure
1760index 4b55fa6..60c3c64 100755
1761--- a/Configure
1762+++ b/Configure
1763@@ -1150,6 +1150,7 @@ set X `for arg in "$@"; do echo "X$arg"; done |
1764 eval "set $*"
1765 shift
1766 rm -f options.awk
1767+rm -f posthint.sh
1768
1769 : set up default values
1770 fastread=''
1771@@ -1172,6 +1173,56 @@ while test $# -gt 0; do
1772 case "$1" in
1773 -d) shift; fastread=yes;;
1774 -e) shift; alldone=cont;;
1775+ -A)
1776+ shift
1777+ xxx=''
1778+ yyy="$1"
1779+ zzz=''
1780+ uuu=undef
1781+ case "$yyy" in
1782+ *=*) zzz=`echo "$yyy"|sed 's!=.*!!'`
1783+ case "$zzz" in
1784+ *:*) zzz='' ;;
1785+ *) xxx=append
1786+ zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'`
1787+ yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
1788+ esac
1789+ ;;
1790+ esac
1791+ case "$xxx" in
1792+ '') case "$yyy" in
1793+ *:*) xxx=`echo "$yyy"|sed 's!:.*!!'`
1794+ yyy=`echo "$yyy"|sed 's!^[^:]*:!!'`
1795+ zzz=`echo "$yyy"|sed 's!^[^=]*=!!'`
1796+ yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
1797+ *) xxx=`echo "$yyy"|sed 's!:.*!!'`
1798+ yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;;
1799+ esac
1800+ ;;
1801+ esac
1802+ case "$xxx" in
1803+ append)
1804+ echo "$yyy=\"\${$yyy}$zzz\"" >> posthint.sh ;;
1805+ clear)
1806+ echo "$yyy=''" >> posthint.sh ;;
1807+ define)
1808+ case "$zzz" in
1809+ '') zzz=define ;;
1810+ esac
1811+ echo "$yyy='$zzz'" >> posthint.sh ;;
1812+ eval)
1813+ echo "eval \"$yyy=$zzz\"" >> posthint.sh ;;
1814+ prepend)
1815+ echo "$yyy=\"$zzz\${$yyy}\"" >> posthint.sh ;;
1816+ undef)
1817+ case "$zzz" in
1818+ '') zzz="$uuu" ;;
1819+ esac
1820+ echo "$yyy=$zzz" >> posthint.sh ;;
1821+ *) echo "$me: unknown -A command '$xxx', ignoring -A $1" >&2 ;;
1822+ esac
1823+ shift
1824+ ;;
1825 -f)
1826 shift
1827 cd ..
1828EOPATCH
1829 }
9a999a97 1830
d1ac19b7
NC
1831 if ($major < 8 && $^O eq 'aix') {
1832 edit_file('Configure', sub {
1833 my $code = shift;
1834 # Replicate commit a8c676c69574838b
1835 # Whitespace allowed at the ends of /lib/syscalls.exp lines
1836 # and half of commit c6912327ae30e6de
1837 # AIX syscalls.exp scan: the syscall might be marked 32, 3264, or 64
1838 $code =~ s{(\bsed\b.*\bsyscall)(?:\[0-9\]\*)?(\$.*/lib/syscalls\.exp)}
1839 {$1 . "[0-9]*[ \t]*" . $2}e;
1840 return $code;
1841 });
1842 }
1843
750ce942
NC
1844 if ($major < 8 && !extract_from_file('Configure',
1845 qr/^\t\tif test ! -t 0; then$/)) {
1846 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was
1847 # not a tty. With that commit, the tty requirement was dropped for -de
1848 # and -dE
1849 # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S
1850 # For those older versions, it's probably easiest if we simply remove
1851 # the sanity test.
1852 edit_file('Configure', sub {
1853 my $code = shift;
1854 $code =~ s/test ! -t 0/test Perl = rules/;
1855 return $code;
1856 });
6a8dbfd7 1857 }
6a8dbfd7 1858
750ce942
NC
1859 if ($major == 8 || $major == 9) {
1860 # Fix symbol detection to that of commit 373dfab3839ca168 if it's any
1861 # intermediate version 5129fff43c4fe08c or later, as the intermediate
1862 # versions don't work correctly on (at least) Sparc Linux.
1863 # 5129fff43c4fe08c adds the first mention of mistrustnm.
1864 # 373dfab3839ca168 removes the last mention of lc=""
1865 edit_file('Configure', sub {
1866 my $code = shift;
1867 return $code
1868 if $code !~ /\btc="";/; # 373dfab3839ca168 or later
1869 return $code
1870 if $code !~ /\bmistrustnm\b/; # before 5129fff43c4fe08c
1871 my $fixed = <<'EOC';
6a8dbfd7 1872
750ce942
NC
1873: is a C symbol defined?
1874csym='tlook=$1;
1875case "$3" in
1876-v) tf=libc.tmp; tdc="";;
1877-a) tf=libc.tmp; tdc="[]";;
1878*) tlook="^$1\$"; tf=libc.list; tdc="()";;
1879esac;
1880tx=yes;
1881case "$reuseval-$4" in
1882true-) ;;
1883true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;;
1884esac;
1885case "$tx" in
1886yes)
1887 tval=false;
1888 if $test "$runnm" = true; then
1889 if $contains $tlook $tf >/dev/null 2>&1; then
1890 tval=true;
1891 elif $test "$mistrustnm" = compile -o "$mistrustnm" = run; then
1892 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
1893 $cc -o try $optimize $ccflags $ldflags try.c >/dev/null 2>&1 $libs && tval=true;
1894 $test "$mistrustnm" = run -a -x try && { $run ./try$_exe >/dev/null 2>&1 || tval=false; };
1895 $rm -f try$_exe try.c core core.* try.core;
1896 fi;
1897 else
1898 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
1899 $cc -o try $optimize $ccflags $ldflags try.c $libs >/dev/null 2>&1 && tval=true;
1900 $rm -f try$_exe try.c;
1901 fi;
1902 ;;
1903*)
1904 case "$tval" in
1905 $define) tval=true;;
1906 *) tval=false;;
1907 esac;
1908 ;;
1909esac;
1910eval "$2=$tval"'
67382a3b 1911
750ce942
NC
1912EOC
1913 $code =~ s/\n: is a C symbol defined\?\n.*?\neval "\$2=\$tval"'\n\n/$fixed/sm
f6647108 1914 or die_255("substitution failed");
750ce942
NC
1915 return $code;
1916 });
1917 }
1918
1919 if ($major < 10
1920 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
1921 # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as
1922 # prior to bd9b35c97ad661cc Configure had the malloc.h test before the
1923 # definition of $compile.
1924 apply_patch(<<'EOPATCH');
1925diff --git a/Configure b/Configure
1926index 3d2e8b9..6ce7766 100755
1927--- a/Configure
1928+++ b/Configure
1929@@ -6743,5 +6743,22 @@ set d_dosuid
1930
1931 : see if this is a malloc.h system
1932-set malloc.h i_malloc
1933-eval $inhdr
1934+: we want a real compile instead of Inhdr because some systems have a
1935+: malloc.h that just gives a compile error saying to use stdlib.h instead
1936+echo " "
1937+$cat >try.c <<EOCP
1938+#include <stdlib.h>
1939+#include <malloc.h>
1940+int main () { return 0; }
1941+EOCP
1942+set try
1943+if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then
1944+ echo "<malloc.h> found." >&4
1945+ val="$define"
1946+else
1947+ echo "<malloc.h> NOT found." >&4
1948+ val="$undef"
1949+fi
1950+$rm -f try.c try
1951+set i_malloc
1952+eval $setvar
1953
1954EOPATCH
1955 }
67382a3b 1956}
6a8dbfd7 1957
750ce942
NC
1958sub patch_hints {
1959 if ($^O eq 'freebsd') {
1960 # There are rather too many version-specific FreeBSD hints fixes to
1961 # patch individually. Also, more than once the FreeBSD hints file has
1962 # been written in what turned out to be a rather non-future-proof style,
1963 # with case statements treating the most recent version as the
1964 # exception, instead of treating previous versions' behaviour explicitly
1965 # and changing the default to cater for the current behaviour. (As
1966 # strangely, future versions inherit the current behaviour.)
1967 checkout_file('hints/freebsd.sh');
1968 } elsif ($^O eq 'darwin') {
1969 if ($major < 8) {
1970 # We can't build on darwin without some of the data in the hints
1971 # file. Probably less surprising to use the earliest version of
1972 # hints/darwin.sh and then edit in place just below, than use
1973 # blead's version, as that would create a discontinuity at
1974 # f556e5b971932902 - before it, hints bugs would be "fixed", after
1975 # it they'd resurface. This way, we should give the illusion of
1976 # monotonic bug fixing.
1977 my $faking_it;
1978 if (!-f 'hints/darwin.sh') {
1979 checkout_file('hints/darwin.sh', 'f556e5b971932902');
1980 ++$faking_it;
1981 }
0afef97d 1982
750ce942
NC
1983 edit_file('hints/darwin.sh', sub {
1984 my $code = shift;
1985 # Part of commit 8f4f83badb7d1ba9, which mostly undoes
1986 # commit 0511a818910f476c.
1987 $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m;
1988 # commit 14c11978e9b52e08/803bb6cc74d36a3f
1989 # Without this, code in libperl.bundle links against op.o
1990 # in preference to opmini.o on the linker command line,
1991 # and hence miniperl tries to use File::Glob instead of
1992 # csh
1993 $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m;
1994 # f556e5b971932902 also patches Makefile.SH with some
1995 # special case code to deal with useshrplib for darwin.
1996 # Given that post 5.8.0 the darwin hints default was
1997 # changed to false, and it would be very complex to splice
1998 # in that code in various versions of Makefile.SH back
1999 # to 5.002, lets just turn it off.
2000 $code =~ s/^useshrplib='true'/useshrplib='false'/m
2001 if $faking_it;
1f1c8096
NC
2002
2003 # Part of commit d235852b65d51c44
2004 # Don't do this on a case sensitive HFS+ partition, as it
2005 # breaks the build for 5.003 and earlier.
2006 if ($case_insensitive
2007 && $code !~ /^firstmakefile=GNUmakefile/) {
2008 $code .= "\nfirstmakefile=GNUmakefile;\n";
2009 }
2010
750ce942
NC
2011 return $code;
2012 });
2013 }
2014 } elsif ($^O eq 'netbsd') {
2015 if ($major < 6) {
2016 # These are part of commit 099685bc64c7dbce
2017 edit_file('hints/netbsd.sh', sub {
2018 my $code = shift;
2019 my $fixed = <<'EOC';
2020case "$osvers" in
20210.9|0.8*)
2022 usedl="$undef"
2023 ;;
2024*)
2025 if [ -f /usr/libexec/ld.elf_so ]; then
2026 d_dlopen=$define
2027 d_dlerror=$define
2028 ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
2029 cccdlflags="-DPIC -fPIC $cccdlflags"
2030 lddlflags="--whole-archive -shared $lddlflags"
2031 elif [ "`uname -m`" = "pmax" ]; then
9f1d18fe 2032# NetBSD 1.3 and 1.3.1 on pmax shipped an 'old' ld.so, which will not work.
750ce942
NC
2033 d_dlopen=$undef
2034 elif [ -f /usr/libexec/ld.so ]; then
2035 d_dlopen=$define
2036 d_dlerror=$define
2037 ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags"
2038# we use -fPIC here because -fpic is *NOT* enough for some of the
2039# extensions like Tk on some netbsd platforms (the sparc is one)
2040 cccdlflags="-DPIC -fPIC $cccdlflags"
2041 lddlflags="-Bforcearchive -Bshareable $lddlflags"
2042 else
2043 d_dlopen=$undef
2044 fi
2045 ;;
2046esac
2047EOC
2048 $code =~ s/^case "\$osvers" in\n0\.9\|0\.8.*?^esac\n/$fixed/ms;
2049 return $code;
2050 });
2051 }
2052 } elsif ($^O eq 'openbsd') {
2053 if ($major < 8) {
2054 checkout_file('hints/openbsd.sh', '43051805d53a3e4c')
2055 unless -f 'hints/openbsd.sh';
2056 my $which = extract_from_file('hints/openbsd.sh',
2057 qr/# from (2\.8|3\.1) onwards/,
2058 '');
2059 if ($which eq '') {
2060 my $was = extract_from_file('hints/openbsd.sh',
2061 qr/(lddlflags="(?:-Bforcearchive )?-Bshareable)/);
2062 # This is commit 154d43cbcf57271c and parts of 5c75dbfa77b0949c
2063 # and 29b5585702e5e025
2064 apply_patch(sprintf <<'EOPATCH', $was);
2065diff --git a/hints/openbsd.sh b/hints/openbsd.sh
2066index a7d8bf2..5b79709 100644
2067--- a/hints/openbsd.sh
2068+++ b/hints/openbsd.sh
2069@@ -37,7 +37,25 @@ OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax)
2070 # we use -fPIC here because -fpic is *NOT* enough for some of the
2071 # extensions like Tk on some OpenBSD platforms (ie: sparc)
2072 cccdlflags="-DPIC -fPIC $cccdlflags"
2073- %s $lddlflags"
2074+ case "$osvers" in
2075+ [01].*|2.[0-7]|2.[0-7].*)
2076+ lddlflags="-Bshareable $lddlflags"
2077+ ;;
2078+ 2.[8-9]|3.0)
2079+ ld=${cc:-cc}
2080+ lddlflags="-shared -fPIC $lddlflags"
2081+ ;;
2082+ *) # from 3.1 onwards
2083+ ld=${cc:-cc}
2084+ lddlflags="-shared -fPIC $lddlflags"
2085+ libswanted=`echo $libswanted | sed 's/ dl / /'`
2086+ ;;
2087+ esac
2088+
2089+ # We need to force ld to export symbols on ELF platforms.
2090+ # Without this, dlopen() is crippled.
2091+ ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2092+ test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2093 ;;
2094 esac
2095
2096EOPATCH
2097 } elsif ($which eq '2.8') {
2098 # This is parts of 5c75dbfa77b0949c and 29b5585702e5e025, and
2099 # possibly eb9cd59d45ad2908
2100 my $was = extract_from_file('hints/openbsd.sh',
2101 qr/lddlflags="(-shared(?: -fPIC)?) \$lddlflags"/);
0afef97d 2102
750ce942
NC
2103 apply_patch(sprintf <<'EOPATCH', $was);
2104--- a/hints/openbsd.sh 2011-10-21 17:25:20.000000000 +0200
2105+++ b/hints/openbsd.sh 2011-10-21 16:58:43.000000000 +0200
2106@@ -44,11 +44,21 @@
2107 [01].*|2.[0-7]|2.[0-7].*)
2108 lddlflags="-Bshareable $lddlflags"
2109 ;;
2110- *) # from 2.8 onwards
2111+ 2.[8-9]|3.0)
2112 ld=${cc:-cc}
2113- lddlflags="%s $lddlflags"
2114+ lddlflags="-shared -fPIC $lddlflags"
2115+ ;;
2116+ *) # from 3.1 onwards
2117+ ld=${cc:-cc}
2118+ lddlflags="-shared -fPIC $lddlflags"
2119+ libswanted=`echo $libswanted | sed 's/ dl / /'`
2120 ;;
2121 esac
2122+
2123+ # We need to force ld to export symbols on ELF platforms.
2124+ # Without this, dlopen() is crippled.
2125+ ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2126+ test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2127 ;;
2128 esac
2129
2130EOPATCH
2131 } elsif ($which eq '3.1'
2132 && !extract_from_file('hints/openbsd.sh',
2133 qr/We need to force ld to export symbols on ELF platforms/)) {
2134 # This is part of 29b5585702e5e025
2135 apply_patch(<<'EOPATCH');
2136diff --git a/hints/openbsd.sh b/hints/openbsd.sh
2137index c6b6bc9..4839d04 100644
2138--- a/hints/openbsd.sh
2139+++ b/hints/openbsd.sh
2140@@ -54,6 +54,11 @@ alpha-2.[0-8]|mips-*|vax-*|powerpc-2.[0-7]|m88k-*)
2141 libswanted=`echo $libswanted | sed 's/ dl / /'`
2142 ;;
2143 esac
2144+
2145+ # We need to force ld to export symbols on ELF platforms.
2146+ # Without this, dlopen() is crippled.
2147+ ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2148+ test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2149 ;;
2150 esac
2151
2152EOPATCH
2153 }
2154 }
2155 } elsif ($^O eq 'linux') {
2156 if ($major < 1) {
2157 # sparc linux seems to need the -Dbool=char -DHAS_BOOL part of
2158 # perl5.000 patch.0n: [address Configure and build issues]
2159 edit_file('hints/linux.sh', sub {
2160 my $code = shift;
2161 $code =~ s!-I/usr/include/bsd!-Dbool=char -DHAS_BOOL!g;
2162 return $code;
2163 });
2164 }
915f531b 2165
750ce942
NC
2166 if ($major <= 9) {
2167 if (`uname -sm` =~ qr/^Linux sparc/) {
2168 if (extract_from_file('hints/linux.sh', qr/sparc-linux/)) {
2169 # Be sure to use -fPIC not -fpic on Linux/SPARC
2170 apply_commit('f6527d0ef0c13ad4');
2171 } elsif(!extract_from_file('hints/linux.sh',
2172 qr/^sparc-linux\)$/)) {
2173 my $fh = open_or_die('hints/linux.sh', '>>');
f6647108 2174 print $fh <<'EOT' or die_255($!);
750ce942
NC
2175
2176case "`uname -m`" in
2177sparc*)
2178 case "$cccdlflags" in
2179 *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
2180 *) cccdlflags="$cccdlflags -fPIC" ;;
2181 esac
2182 ;;
2183esac
2184EOT
2185 close_or_die($fh);
2186 }
2187 }
2188 }
1f0f6439
NC
2189 } elsif ($^O eq 'solaris') {
2190 if (($major == 13 || $major == 14)
2191 && extract_from_file('hints/solaris_2.sh', qr/getconfldllflags/)) {
2192 apply_commit('c80bde4388070c45');
2193 }
915f531b
NC
2194 }
2195}
2196
bb723266
NC
2197sub patch_SH {
2198 # Cwd.xs added in commit 0d2079faa739aaa9. Cwd.pm moved to ext/ 8 years
2199 # later in commit 403f501d5b37ebf0
2200 if ($major > 0 && <*/Cwd/Cwd.xs>) {
2201 if ($major < 10
2202 && !extract_from_file('Makefile.SH', qr/^extra_dep=''$/)) {
2203 # The Makefile.PL for Unicode::Normalize needs
2204 # lib/unicore/CombiningClass.pl. Even without a parallel build, we
2205 # need a dependency to ensure that it builds. This is a variant of
2206 # commit 9f3ef600c170f61e. Putting this for earlier versions gives
2207 # us a spot on which to hang the edits below
2208 apply_patch(<<'EOPATCH');
2209diff --git a/Makefile.SH b/Makefile.SH
2210index f61d0db..6097954 100644
2211--- a/Makefile.SH
2212+++ b/Makefile.SH
2213@@ -155,10 +155,20 @@ esac
2214
2215 : Prepare dependency lists for Makefile.
2216 dynamic_list=' '
2217+extra_dep=''
2218 for f in $dynamic_ext; do
2219 : the dependency named here will never exist
2220 base=`echo "$f" | sed 's/.*\///'`
2221- dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
2222+ this_target="lib/auto/$f/$base.$dlext"
2223+ dynamic_list="$dynamic_list $this_target"
2224+
2225+ : Parallel makes reveal that we have some interdependencies
2226+ case $f in
2227+ Math/BigInt/FastCalc) extra_dep="$extra_dep
2228+$this_target: lib/auto/List/Util/Util.$dlext" ;;
2229+ Unicode/Normalize) extra_dep="$extra_dep
2230+$this_target: lib/unicore/CombiningClass.pl" ;;
2231+ esac
2232 done
2233
2234 static_list=' '
2235@@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
2236 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
2237+!NO!SUBS!
2238+
2239+$spitshell >>Makefile <<EOF
2240+$extra_dep
2241+EOF
2242+
2243+$spitshell >>Makefile <<'!NO!SUBS!'
2244
2245EOPATCH
2246 }
c0960282 2247
67bec938
NC
2248 if ($major == 15 && $^O !~ /^(linux|darwin|.*bsd)$/
2249 && extract_from_file('Makefile.SH', qr/^V.* \?= /)) {
2250 # Remove the GNU-make-ism (which the BSD makes also support, but
2251 # most other makes choke on)
2252 apply_patch(<<'EOPATCH');
2253diff --git a/Makefile.SH b/Makefile.SH
2254index 94952bd..13e9001 100755
2255--- a/Makefile.SH
2256+++ b/Makefile.SH
2257@@ -338,8 +338,8 @@ linux*|darwin)
2258 $spitshell >>$Makefile <<!GROK!THIS!
2259 # If you're going to use valgrind and it can't be invoked as plain valgrind
2260 # then you'll need to change this, or override it on the make command line.
2261-VALGRIND ?= valgrind
2262-VG_TEST ?= ./perl -e 1 2>/dev/null
2263+VALGRIND = valgrind
2264+VG_TEST = ./perl -e 1 2>/dev/null
2265
2266 !GROK!THIS!
2267 ;;
2268EOPATCH
2269 }
2270
c0960282
NC
2271 if ($major == 11) {
2272 if (extract_from_file('patchlevel.h',
2273 qr/^#include "unpushed\.h"/)) {
2274 # I had thought it easier to detect when building one of the 52
2275 # commits with the original method of incorporating the git
2276 # revision and drop parallel make flags. Commits shown by
2277 # git log 46807d8e809cc127^..dcff826f70bf3f64^ ^d4fb0a1f15d1a1c4
2278 # However, it's not actually possible to make miniperl for that
2279 # configuration as-is, because the file .patchnum is only made
2280 # as a side effect of target 'all'
2281 # I also don't think that it's "safe" to simply run
2282 # make_patchnum.sh before the build. We need the proper
2283 # dependency rules in the Makefile to *stop* it being run again
2284 # at the wrong time.
2285 # This range is important because contains the commit that
2286 # merges Schwern's y2038 work.
2287 apply_patch(<<'EOPATCH');
2288diff --git a/Makefile.SH b/Makefile.SH
2289index 9ad8b6f..106e721 100644
2290--- a/Makefile.SH
2291+++ b/Makefile.SH
2292@@ -540,9 +544,14 @@ sperl.i: perl.c $(h)
2293
2294 .PHONY: all translators utilities make_patchnum
2295
2296-make_patchnum:
2297+make_patchnum: lib/Config_git.pl
2298+
2299+lib/Config_git.pl: make_patchnum.sh
2300 sh $(shellflags) make_patchnum.sh
2301
2302+# .patchnum, unpushed.h and lib/Config_git.pl are built by make_patchnum.sh
2303+unpushed.h .patchnum: lib/Config_git.pl
2304+
2305 # make sure that we recompile perl.c if .patchnum changes
2306 perl$(OBJ_EXT): .patchnum unpushed.h
2307
2308EOPATCH
2309 } elsif (-f '.gitignore'
2310 && extract_from_file('.gitignore', qr/^\.patchnum$/)) {
2311 # 8565263ab8a47cda to 46807d8e809cc127^ inclusive.
2312 edit_file('Makefile.SH', sub {
2313 my $code = shift;
2314 $code =~ s/^make_patchnum:\n/make_patchnum: .patchnum
2315
2316.sha1: .patchnum
2317
2318.patchnum: make_patchnum.sh
2319/m;
2320 return $code;
2321 });
74adbdfa
NC
2322 } elsif (-f 'lib/.gitignore'
2323 && extract_from_file('lib/.gitignore',
2324 qr!^/Config_git.pl!)
2325 && !extract_from_file('Makefile.SH',
2326 qr/^uudmap\.h.*:bitcount.h$/)) {
2327 # Between commits and dcff826f70bf3f64 and 0f13ebd5d71f8177^
2328 edit_file('Makefile.SH', sub {
2329 my $code = shift;
2330 # Bug introduced by 344af494c35a9f0f
2331 # fixed in 0f13ebd5d71f8177
2332 $code =~ s{^(pod/perlapi\.pod) (pod/perlintern\.pod): }
2333 {$1: $2\n\n$2: }m;
2334 # Bug introduced by efa50c51e3301a2c
2335 # fixed in 0f13ebd5d71f8177
2336 $code =~ s{^(uudmap\.h) (bitcount\.h): }
2337 {$1: $2\n\n$2: }m;
93a0b6a3
NC
2338
2339 # The rats nest of getting git_version.h correct
2340
2341 if ($code =~ s{git_version\.h: stock_git_version\.h
2342\tcp stock_git_version\.h git_version\.h}
2343 {}m) {
2344 # before 486cd780047ff224
2345
2346 # We probably can't build between
2347 # 953f6acfa20ec275^ and 8565263ab8a47cda
2348 # inclusive, but all commits in that range
2349 # relate to getting make_patchnum.sh working,
2350 # so it is extremely unlikely to be an
2351 # interesting bisect target. They will skip.
2352
2353 # No, don't spawn a submake if
2354 # make_patchnum.sh or make_patchnum.pl fails
2355 $code =~ s{\|\| \$\(MAKE\) miniperl.*}
2356 {}m;
2357 $code =~ s{^\t(sh.*make_patchnum\.sh.*)}
2358 {\t-$1}m;
2359
2360 # Use an external perl to run make_patchnum.pl
2361 # because miniperl still depends on
2362 # git_version.h
2363 $code =~ s{^\t.*make_patchnum\.pl}
2364 {\t-$^X make_patchnum.pl}m;
2365
2366
2367 # "Truth in advertising" - running
2368 # make_patchnum generates 2 files.
2369 $code =~ s{^make_patchnum:.*}{
2370make_patchnum: lib/Config_git.pl
2371
2372git_version.h: lib/Config_git.pl
2373
2374perlmini\$(OBJ_EXT): git_version.h
2375
2376lib/Config_git.pl:}m;
2377 }
356fb8dd
NC
2378 # Right, now we've corrected Makefile.SH to
2379 # correctly describe how lib/Config_git.pl and
2380 # git_version.h are made, we need to fix the rest
2381
2382 # This emulates commit 2b63e250843b907e
2383 # This might duplicate the rule stating that
2384 # git_version.h depends on lib/Config_git.pl
2385 # This is harmless.
2386 $code =~ s{^(?:lib/Config_git\.pl )?git_version\.h: (.* make_patchnum\.pl.*)}
2387 {git_version.h: lib/Config_git.pl
2388
2389lib/Config_git.pl: $1}m;
2390
97897675
NC
2391 # This emulates commits 0f13ebd5d71f8177 and
2392 # and a04d4598adc57886. It ensures that
2393 # lib/Config_git.pl is built before configpm,
2394 # and that configpm is run exactly once.
2395 $code =~ s{^(\$\(.*?\) )?(\$\(CONFIGPOD\))(: .*? configpm Porting/Glossary)( lib/Config_git\.pl)?}{
2396 # If present, other files depend on $(CONFIGPOD)
2397 ($1 ? "$1: $2\n\n" : '')
2398 # Then the rule we found
2399 . $2 . $3
2400 # Add dependency if not there
2401 . ($4 ? $4 : ' lib/Config_git.pl')
2402 }me;
2403
74adbdfa
NC
2404 return $code;
2405 });
c0960282
NC
2406 }
2407 }
2408
bb723266
NC
2409 if ($major < 14) {
2410 # Commits dc0655f797469c47 and d11a62fe01f2ecb2
2411 edit_file('Makefile.SH', sub {
2412 my $code = shift;
2413 foreach my $ext (qw(Encode SDBM_File)) {
2414 next if $code =~ /\b$ext\) extra_dep=/s;
2415 $code =~ s!(\) extra_dep="\$extra_dep
2416\$this_target: .*?" ;;)
2417( esac
2418)!$1
2419 $ext) extra_dep="\$extra_dep
2420\$this_target: lib/auto/Cwd/Cwd.\$dlext" ;;
2421$2!;
2422 }
2423 return $code;
2424 });
2425 }
2426 }
2427
2428 if ($major == 7) {
2429 # Remove commits 9fec149bb652b6e9 and 5bab1179608f81d8, which add/amend
2430 # rules to automatically run regen scripts that rebuild C headers. These
2431 # cause problems because a git checkout doesn't preserve relative file
2432 # modification times, hence the regen scripts may fire. This will
2433 # obscure whether the repository had the correct generated headers
2434 # checked in.
2435 # Also, the dependency rules for running the scripts were not correct,
2436 # which could cause spurious re-builds on re-running make, and can cause
2437 # complete build failures for a parallel make.
2438 if (extract_from_file('Makefile.SH',
2439 qr/Writing it this way gives make a big hint to always run opcode\.pl before/)) {
2440 apply_commit('70c6e6715e8fec53');
2441 } elsif (extract_from_file('Makefile.SH',
2442 qr/^opcode\.h opnames\.h pp_proto\.h pp\.sym: opcode\.pl$/)) {
2443 revert_commit('9fec149bb652b6e9');
2444 }
2445 }
2446
e628fd8c
NC
2447 if ($^O eq 'aix' && $major >= 11 && $major <= 15
2448 && extract_from_file('makedef.pl', qr/^use Config/)) {
2449 edit_file('Makefile.SH', sub {
2450 # The AIX part of commit e6807d8ab22b761c
2451 # It's safe to substitute lib/Config.pm for config.sh
2452 # as lib/Config.pm depends on config.sh
2453 # If the tree is post e6807d8ab22b761c, the substitution
2454 # won't match, which is harmless.
2455 my $code = shift;
2456 $code =~ s{^(perl\.exp:.* )config\.sh(\b.*)}
2457 {$1 . '$(CONFIGPM)' . $2}me;
2458 return $code;
2459 });
2460 }
2461
bb723266
NC
2462 # There was a bug in makedepend.SH which was fixed in version 96a8704c.
2463 # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
2464 # Remove this if you're actually bisecting a problem related to
2465 # makedepend.SH
2466 # If you do this, you may need to add in code to correct the output of older
2467 # makedepends, which don't correctly filter newer gcc output such as
2468 # <built-in>
2469 checkout_file('makedepend.SH');
2470
2471 if ($major < 4 && -f 'config.sh'
2472 && !extract_from_file('config.sh', qr/^trnl=/)) {
2473 # This seems to be necessary to avoid makedepend becoming confused,
2474 # and hanging on stdin. Seems that the code after
2475 # make shlist || ...here... is never run.
2476 edit_file('makedepend.SH', sub {
2477 my $code = shift;
2478 $code =~ s/^trnl='\$trnl'$/trnl='\\n'/m;
2479 return $code;
2480 });
2481 }
2482}
2483
2484sub patch_C {
2485 # This is ordered by $major, as it's likely that different platforms may
2486 # well want to share code.
2487
2488 if ($major == 2 && extract_from_file('perl.c', qr/^\tfclose\(e_fp\);$/)) {
2489 # need to patch perl.c to avoid calling fclose() twice on e_fp when
2490 # using -e
2491 # This diff is part of commit ab821d7fdc14a438. The second close was
2492 # introduced with perl-5.002, commit a5f75d667838e8e7
2493 # Might want a6c477ed8d4864e6 too, for the corresponding change to
2494 # pp_ctl.c (likely without this, eval will have "fun")
2495 apply_patch(<<'EOPATCH');
2496diff --git a/perl.c b/perl.c
2497index 03c4d48..3c814a2 100644
2498--- a/perl.c
2499+++ b/perl.c
2500@@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
2501 #ifndef VMS /* VMS doesn't have environ array */
2502 origenviron = environ;
2503 #endif
2504+ e_tmpname = Nullch;
2505
2506 if (do_undump) {
2507
2508@@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
2509 if (e_fp) {
2510 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
2511 croak("Can't write to temp file for -e: %s", Strerror(errno));
2512+ e_fp = Nullfp;
2513 argc++,argv--;
2514 scriptname = e_tmpname;
2515 }
2516@@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
2517 curcop->cop_line = 0;
2518 curstash = defstash;
2519 preprocess = FALSE;
2520- if (e_fp) {
2521- fclose(e_fp);
2522- e_fp = Nullfp;
2523+ if (e_tmpname) {
2524 (void)UNLINK(e_tmpname);
2525+ Safefree(e_tmpname);
2526+ e_tmpname = Nullch;
2527 }
2528
2529 /* now that script is parsed, we can modify record separator */
2530@@ -1369,7 +1371,7 @@ SV *sv;
2531 scriptname = xfound;
2532 }
2533
2534- origfilename = savepv(e_fp ? "-e" : scriptname);
2535+ origfilename = savepv(e_tmpname ? "-e" : scriptname);
2536 curcop->cop_filegv = gv_fetchfile(origfilename);
2537 if (strEQ(origfilename,"-"))
2538 scriptname = "";
2539
2540EOPATCH
2541 }
2542
2543 if ($major < 3 && $^O eq 'openbsd'
2544 && !extract_from_file('pp_sys.c', qr/BSD_GETPGRP/)) {
2545 # Part of commit c3293030fd1b7489
2546 apply_patch(<<'EOPATCH');
2547diff --git a/pp_sys.c b/pp_sys.c
2548index 4608a2a..f0c9d1d 100644
2549--- a/pp_sys.c
2550+++ b/pp_sys.c
2551@@ -2903,8 +2903,8 @@ PP(pp_getpgrp)
2552 pid = 0;
2553 else
2554 pid = SvIVx(POPs);
2555-#ifdef USE_BSDPGRP
2556- value = (I32)getpgrp(pid);
2557+#ifdef BSD_GETPGRP
2558+ value = (I32)BSD_GETPGRP(pid);
2559 #else
2560 if (pid != 0)
2561 DIE("POSIX getpgrp can't take an argument");
2562@@ -2933,8 +2933,8 @@ PP(pp_setpgrp)
2563 }
2564
2565 TAINT_PROPER("setpgrp");
2566-#ifdef USE_BSDPGRP
2567- SETi( setpgrp(pid, pgrp) >= 0 );
2568+#ifdef BSD_SETPGRP
2569+ SETi( BSD_SETPGRP(pid, pgrp) >= 0 );
2570 #else
2571 if ((pgrp != 0) || (pid != 0)) {
2572 DIE("POSIX setpgrp can't take an argument");
2573EOPATCH
2574 }
2575
2576 if ($major < 4 && $^O eq 'openbsd') {
2577 my $bad;
2578 # Need changes from commit a6e633defa583ad5.
2579 # Commits c07a80fdfe3926b5 and f82b3d4130164d5f changed the same part
2580 # of perl.h
2581
2582 if (extract_from_file('perl.h',
2583 qr/^#ifdef HAS_GETPGRP2$/)) {
2584 $bad = <<'EOBAD';
2585***************
2586*** 57,71 ****
2587 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2588 #define TAINT_ENV() if (tainting) taint_env()
2589
2590! #ifdef HAS_GETPGRP2
2591! # ifndef HAS_GETPGRP
2592! # define HAS_GETPGRP
2593! # endif
2594! #endif
2595!
2596! #ifdef HAS_SETPGRP2
2597! # ifndef HAS_SETPGRP
2598! # define HAS_SETPGRP
2599! # endif
2600 #endif
2601
2602EOBAD
2603 } elsif (extract_from_file('perl.h',
2604 qr/Gack, you have one but not both of getpgrp2/)) {
2605 $bad = <<'EOBAD';
2606***************
2607*** 56,76 ****
2608 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2609 #define TAINT_ENV() if (tainting) taint_env()
2610
2611! #if defined(HAS_GETPGRP2) && defined(HAS_SETPGRP2)
2612! # define getpgrp getpgrp2
2613! # define setpgrp setpgrp2
2614! # ifndef HAS_GETPGRP
2615! # define HAS_GETPGRP
2616! # endif
2617! # ifndef HAS_SETPGRP
2618! # define HAS_SETPGRP
2619! # endif
2620! # ifndef USE_BSDPGRP
2621! # define USE_BSDPGRP
2622! # endif
2623! #else
2624! # if defined(HAS_GETPGRP2) || defined(HAS_SETPGRP2)
2625! #include "Gack, you have one but not both of getpgrp2() and setpgrp2()."
2626! # endif
2627 #endif
2628
2629EOBAD
2630 } elsif (extract_from_file('perl.h',
2631 qr/^#ifdef USE_BSDPGRP$/)) {
2632 $bad = <<'EOBAD'
2633***************
2634*** 91,116 ****
2635 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2636 #define TAINT_ENV() if (tainting) taint_env()
2637
2638! #ifdef USE_BSDPGRP
2639! # ifdef HAS_GETPGRP
2640! # define BSD_GETPGRP(pid) getpgrp((pid))
2641! # endif
2642! # ifdef HAS_SETPGRP
2643! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
2644! # endif
2645! #else
2646! # ifdef HAS_GETPGRP2
2647! # define BSD_GETPGRP(pid) getpgrp2((pid))
2648! # ifndef HAS_GETPGRP
2649! # define HAS_GETPGRP
2650! # endif
2651! # endif
2652! # ifdef HAS_SETPGRP2
2653! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
2654! # ifndef HAS_SETPGRP
2655! # define HAS_SETPGRP
2656! # endif
2657! # endif
2658 #endif
2659
2660 #ifndef _TYPES_ /* If types.h defines this it's easy. */
2661EOBAD
2662 }
2663 if ($bad) {
2664 apply_patch(<<"EOPATCH");
2665*** a/perl.h 2011-10-21 09:46:12.000000000 +0200
2666--- b/perl.h 2011-10-21 09:46:12.000000000 +0200
2667$bad--- 91,144 ----
2668 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2669 #define TAINT_ENV() if (tainting) taint_env()
2670
2671! /* XXX All process group stuff is handled in pp_sys.c. Should these
2672! defines move there? If so, I could simplify this a lot. --AD 9/96.
2673! */
2674! /* Process group stuff changed from traditional BSD to POSIX.
2675! perlfunc.pod documents the traditional BSD-style syntax, so we'll
2676! try to preserve that, if possible.
2677! */
2678! #ifdef HAS_SETPGID
2679! # define BSD_SETPGRP(pid, pgrp) setpgid((pid), (pgrp))
2680! #else
2681! # if defined(HAS_SETPGRP) && defined(USE_BSD_SETPGRP)
2682! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
2683! # else
2684! # ifdef HAS_SETPGRP2 /* DG/UX */
2685! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
2686! # endif
2687! # endif
2688! #endif
2689! #if defined(BSD_SETPGRP) && !defined(HAS_SETPGRP)
2690! # define HAS_SETPGRP /* Well, effectively it does . . . */
2691! #endif
2692!
2693! /* getpgid isn't POSIX, but at least Solaris and Linux have it, and it makes
2694! our life easier :-) so we'll try it.
2695! */
2696! #ifdef HAS_GETPGID
2697! # define BSD_GETPGRP(pid) getpgid((pid))
2698! #else
2699! # if defined(HAS_GETPGRP) && defined(USE_BSD_GETPGRP)
2700! # define BSD_GETPGRP(pid) getpgrp((pid))
2701! # else
2702! # ifdef HAS_GETPGRP2 /* DG/UX */
2703! # define BSD_GETPGRP(pid) getpgrp2((pid))
2704! # endif
2705! # endif
2706! #endif
2707! #if defined(BSD_GETPGRP) && !defined(HAS_GETPGRP)
2708! # define HAS_GETPGRP /* Well, effectively it does . . . */
2709! #endif
2710!
2711! /* These are not exact synonyms, since setpgrp() and getpgrp() may
2712! have different behaviors, but perl.h used to define USE_BSDPGRP
2713! (prior to 5.003_05) so some extension might depend on it.
2714! */
2715! #if defined(USE_BSD_SETPGRP) || defined(USE_BSD_GETPGRP)
2716! # ifndef USE_BSDPGRP
2717! # define USE_BSDPGRP
2718! # endif
2719 #endif
2720
2721 #ifndef _TYPES_ /* If types.h defines this it's easy. */
2722EOPATCH
2723 }
2724 }
2725
8245f086
NC
2726 if ($major < 4 && $^O eq 'hpux'
2727 && extract_from_file('sv.c', qr/i = _filbuf\(/)) {
2728 apply_patch(<<'EOPATCH');
2729diff --git a/sv.c b/sv.c
2730index a1f1d60..0a806f1 100644
2731--- a/sv.c
2732+++ b/sv.c
2733@@ -2641,7 +2641,7 @@ I32 append;
2734
2735 FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */
2736 FILE_ptr(fp) = ptr;
2737- i = _filbuf(fp); /* get more characters */
2738+ i = __filbuf(fp); /* get more characters */
2739 cnt = FILE_cnt(fp);
2740 ptr = FILE_ptr(fp); /* reregisterize cnt and ptr */
2741
2742
2743EOPATCH
2744 }
2745
bb723266
NC
2746 if ($major == 4 && extract_from_file('scope.c', qr/\(SV\*\)SSPOPINT/)) {
2747 # [PATCH] 5.004_04 +MAINT_TRIAL_1 broken when sizeof(int) != sizeof(void)
2748 # Fixes a bug introduced in 161b7d1635bc830b
2749 apply_commit('9002cb76ec83ef7f');
2750 }
2751
2752 if ($major == 4 && extract_from_file('av.c', qr/AvARRAY\(av\) = 0;/)) {
2753 # Fixes a bug introduced in 1393e20655efb4bc
2754 apply_commit('e1c148c28bf3335b', 'av.c');
2755 }
2756
6626a474
NC
2757 if ($major == 4) {
2758 my $rest = extract_from_file('perl.c', qr/delimcpy(.*)/);
2759 if (defined $rest and $rest !~ /,$/) {
2760 # delimcpy added in fc36a67e8855d031, perl.c refactored to use it.
2761 # bug introduced in 2a92aaa05aa1acbf, fixed in 8490252049bf42d3
2762 # code then moved to util.c in commit 491527d0220de34e
2763 apply_patch(<<'EOPATCH');
bb723266
NC
2764diff --git a/perl.c b/perl.c
2765index 4eb69e3..54bbb00 100644
2766--- a/perl.c
2767+++ b/perl.c
2768@@ -1735,7 +1735,7 @@ SV *sv;
2769 if (len < sizeof tokenbuf)
2770 tokenbuf[len] = '\0';
2771 #else /* ! (atarist || DOSISH) */
2772- s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend
2773+ s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend,
2774 ':',
2775 &len);
2776 #endif /* ! (atarist || DOSISH) */
2777EOPATCH
6626a474 2778 }
bb723266
NC
2779 }
2780
2781 if ($major == 4 && $^O eq 'linux') {
2782 # Whilst this is fixed properly in f0784f6a4c3e45e1 which provides the
2783 # Configure probe, it's easier to back out the problematic changes made
c8ac76a5
NC
2784 # in these previous commits.
2785
2786 # In maint-5.004, the simplest addition is to "correct" the file to
2787 # use the same pre-processor macros as blead had used. Whilst commit
2788 # 9b599b2a63d2324d (reverted below) is described as
2789 # [win32] merge change#887 from maintbranch
2790 # it uses __sun__ and __svr4__ instead of the __sun and __SVR4 of the
2791 # maint branch commit 6cdf74fe31f049dc
2792
2793 edit_file('doio.c', sub {
2794 my $code = shift;
2795 $code =~ s{defined\(__sun\) && defined\(__SVR4\)}
2796 {defined(__sun__) && defined(__svr4__)}g;
2797 return $code;
2798 });
2799
bb723266
NC
2800 if (extract_from_file('doio.c',
2801 qr!^/\* XXX REALLY need metaconfig test \*/$!)) {
2802 revert_commit('4682965a1447ea44', 'doio.c');
2803 }
2804 if (my $token = extract_from_file('doio.c',
2805 qr!^#if (defined\(__sun(?:__)?\)) && defined\(__svr4__\) /\* XXX Need metaconfig test \*/$!)) {
2806 my $patch = `git show -R 9b599b2a63d2324d doio.c`;
2807 $patch =~ s/defined\(__sun__\)/$token/g;
2808 apply_patch($patch);
2809 }
2810 if (extract_from_file('doio.c',
2811 qr!^/\* linux \(and Solaris2\?\) uses :$!)) {
2812 revert_commit('8490252049bf42d3', 'doio.c');
2813 }
2814 if (extract_from_file('doio.c',
2815 qr/^ unsemds.buf = &semds;$/)) {
2816 revert_commit('8e591e46b4c6543e');
2817 }
2818 if (extract_from_file('doio.c',
2819 qr!^#ifdef __linux__ /\* XXX Need metaconfig test \*/$!)) {
2820 # Reverts part of commit 3e3baf6d63945cb6
2821 apply_patch(<<'EOPATCH');
2822diff --git b/doio.c a/doio.c
2823index 62b7de9..0d57425 100644
2824--- b/doio.c
2825+++ a/doio.c
2826@@ -1333,9 +1331,6 @@ SV **sp;
2827 char *a;
2828 I32 id, n, cmd, infosize, getinfo;
2829 I32 ret = -1;
2830-#ifdef __linux__ /* XXX Need metaconfig test */
2831- union semun unsemds;
2832-#endif
2833
2834 id = SvIVx(*++mark);
2835 n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0;
2836@@ -1364,29 +1359,11 @@ SV **sp;
2837 infosize = sizeof(struct semid_ds);
2838 else if (cmd == GETALL || cmd == SETALL)
2839 {
2840-#ifdef __linux__ /* XXX Need metaconfig test */
2841-/* linux uses :
2842- int semctl (int semid, int semnun, int cmd, union semun arg)
2843-
2844- union semun {
2845- int val;
2846- struct semid_ds *buf;
2847- ushort *array;
2848- };
2849-*/
2850- union semun semds;
2851- if (semctl(id, 0, IPC_STAT, semds) == -1)
2852-#else
2853 struct semid_ds semds;
2854 if (semctl(id, 0, IPC_STAT, &semds) == -1)
2855-#endif
2856 return -1;
2857 getinfo = (cmd == GETALL);
2858-#ifdef __linux__ /* XXX Need metaconfig test */
2859- infosize = semds.buf->sem_nsems * sizeof(short);
2860-#else
2861 infosize = semds.sem_nsems * sizeof(short);
2862-#endif
2863 /* "short" is technically wrong but much more portable
2864 than guessing about u_?short(_t)? */
2865 }
2866@@ -1429,12 +1406,7 @@ SV **sp;
2867 #endif
2868 #ifdef HAS_SEM
2869 case OP_SEMCTL:
2870-#ifdef __linux__ /* XXX Need metaconfig test */
2871- unsemds.buf = (struct semid_ds *)a;
2872- ret = semctl(id, n, cmd, unsemds);
2873-#else
2874 ret = semctl(id, n, cmd, (struct semid_ds *)a);
2875-#endif
2876 break;
2877 #endif
2878 #ifdef HAS_SHM
2879EOPATCH
2880 }
2881 # Incorrect prototype added as part of 8ac853655d9b7447, fixed as part
2882 # of commit dc45a647708b6c54, with at least one intermediate
2883 # modification. Correct prototype for gethostbyaddr has socklen_t
2884 # second. Linux has uint32_t first for getnetbyaddr.
2885 # Easiest just to remove, instead of attempting more complex patching.
2886 # Something similar may be needed on other platforms.
2887 edit_file('pp_sys.c', sub {
2888 my $code = shift;
2889 $code =~ s/^ struct hostent \*(?:PerlSock_)?gethostbyaddr\([^)]+\);$//m;
2890 $code =~ s/^ struct netent \*getnetbyaddr\([^)]+\);$//m;
2891 return $code;
2892 });
2893 }
2894
d1ac19b7
NC
2895 if ($major < 5 && $^O eq 'aix'
2896 && !extract_from_file('pp_sys.c',
2897 qr/defined\(HOST_NOT_FOUND\) && !defined\(h_errno\)/)) {
2898 # part of commit dc45a647708b6c54
2899 # Andy Dougherty's configuration patches (Config_63-01 up to 04).
2900 apply_patch(<<'EOPATCH')
2901diff --git a/pp_sys.c b/pp_sys.c
2902index c2fcb6f..efa39fb 100644
2903--- a/pp_sys.c
2904+++ b/pp_sys.c
2905@@ -54,7 +54,7 @@ extern "C" int syscall(unsigned long,...);
2906 #endif
2907 #endif
2908
2909-#ifdef HOST_NOT_FOUND
2910+#if defined(HOST_NOT_FOUND) && !defined(h_errno)
2911 extern int h_errno;
2912 #endif
2913
2914EOPATCH
2915 }
2916
df01cf53 2917 if ($major == 5
31940c07
NC
2918 && `git rev-parse HEAD` eq "22c35a8c2392967a5ba6b5370695be464bd7012c\n") {
2919 # Commit 22c35a8c2392967a is significant,
2920 # "phase 1 of somewhat major rearrangement of PERL_OBJECT stuff"
2921 # but doesn't build due to 2 simple errors. blead in this broken state
2922 # was merged to the cfgperl branch, and then these were immediately
2923 # corrected there. cfgperl (with the fixes) was merged back to blead.
2924 # The resultant rather twisty maze of commits looks like this:
2925
911bfca9 2926=begin comment
31940c07
NC
2927
2928* | | commit 137225782c183172f360c827424b9b9f8adbef0e
2929|\ \ \ Merge: 22c35a8 2a8ee23
2930| |/ / Author: Gurusamy Sarathy <gsar@cpan.org>
2931| | | Date: Fri Oct 30 17:38:36 1998 +0000
2932| | |
2933| | | integrate cfgperl tweaks into mainline
2934| | |
2935| | | p4raw-id: //depot/perl@2144
2936| | |
2937| * | commit 2a8ee23279873759693fa83eca279355db2b665c
2938| | | Author: Jarkko Hietaniemi <jhi@iki.fi>
2939| | | Date: Fri Oct 30 13:27:39 1998 +0000
2940| | |
2941| | | There can be multiple yacc/bison errors.
2942| | |
2943| | | p4raw-id: //depot/cfgperl@2143
2944| | |
2945| * | commit 93fb2ac393172fc3e2c14edb20b718309198abbc
2946| | | Author: Jarkko Hietaniemi <jhi@iki.fi>
2947| | | Date: Fri Oct 30 13:18:43 1998 +0000
2948| | |
2949| | | README.posix-bc update.
2950| | |
2951| | | p4raw-id: //depot/cfgperl@2142
2952| | |
2953| * | commit 4ec43091e8e6657cb260b5e563df30aaa154effe
2954| | | Author: Jarkko Hietaniemi <jhi@iki.fi>
2955| | | Date: Fri Oct 30 09:12:59 1998 +0000
2956| | |
2957| | | #2133 fallout.
2958| | |
2959| | | p4raw-id: //depot/cfgperl@2141
2960| | |
2961| * | commit 134ca994cfefe0f613d43505a885e4fc2100b05c
2962| |\ \ Merge: 7093112 22c35a8
2963| |/ / Author: Jarkko Hietaniemi <jhi@iki.fi>
2964|/| | Date: Fri Oct 30 08:43:18 1998 +0000
2965| | |
2966| | | Integrate from mainperl.
2967| | |
2968| | | p4raw-id: //depot/cfgperl@2140
2969| | |
2970* | | commit 22c35a8c2392967a5ba6b5370695be464bd7012c
2971| | | Author: Gurusamy Sarathy <gsar@cpan.org>
2972| | | Date: Fri Oct 30 02:51:39 1998 +0000
2973| | |
2974| | | phase 1 of somewhat major rearrangement of PERL_OBJECT stuff
2975| | | (objpp.h is gone, embed.pl now does some of that); objXSUB.h
2976| | | should soon be automated also; the global variables that
2977| | | escaped the PL_foo conversion are now reined in; renamed
2978| | | MAGIC in regcomp.h to REG_MAGIC to avoid collision with the
2979| | | type of same name; duplicated lists of pp_things in various
2980| | | places is now gone; result has only been tested on win32
2981| | |
2982| | | p4raw-id: //depot/perl@2133
2983
911bfca9
NC
2984=end comment
2985
31940c07
NC
2986=cut
2987
2988 # and completely confuses git bisect (and at least me), causing it to
2989 # the bisect run to confidently return the wrong answer, an unrelated
2990 # commit on the cfgperl branch.
2991
2992 apply_commit('4ec43091e8e6657c');
2993 }
2994
2995 if ($major == 5
df01cf53
NC
2996 && extract_from_file('pp_sys.c', qr/PERL_EFF_ACCESS_R_OK/)
2997 && !extract_from_file('pp_sys.c', qr/XXX Configure test needed for eaccess/)) {
2998 # Between 5ff3f7a4e03a6b10 and c955f1177b2e311d^
2999 # This is the meat of commit c955f1177b2e311d (without the other
3000 # indenting changes that would cause a conflict).
3001 # Without this 538 revisions won't build on (at least) Linux
3002 apply_patch(<<'EOPATCH');
3003diff --git a/pp_sys.c b/pp_sys.c
3004index d60c8dc..867dee4 100644
3005--- a/pp_sys.c
3006+++ b/pp_sys.c
3007@@ -198,9 +198,18 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true";
3008 # if defined(I_SYS_SECURITY)
3009 # include <sys/security.h>
3010 # endif
3011-# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
3012-# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
3013-# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
3014+ /* XXX Configure test needed for eaccess */
3015+# ifdef ACC_SELF
3016+ /* HP SecureWare */
3017+# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
3018+# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
3019+# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
3020+# else
3021+ /* SCO */
3022+# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK))
3023+# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK))
3024+# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK))
3025+# endif
3026 #endif
3027
3028 #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF)
3029EOPATCH
3030 }
3031
bb35dd48
NC
3032 if ($major == 5
3033 && extract_from_file('mg.c', qr/If we're still on top of the stack, pop us off/)
af6a5d0e 3034 && !extract_from_file('mg.c', qr/PL_savestack_ix -= popval/)) {
bb35dd48
NC
3035 # Fix up commit 455ece5e082708b1:
3036 # SSNEW() API for allocating memory on the savestack
3037 # Message-Id: <tqemtae338.fsf@puma.genscan.com>
3038 # Subject: [PATCH 5.005_51] (was: why SAVEDESTRUCTOR()...)
3039 apply_commit('3c8a44569607336e', 'mg.c');
3040 }
3041
6863570c
NC
3042 if ($major == 5) {
3043 if (extract_from_file('doop.c', qr/croak\(no_modify\);/)
3044 && extract_from_file('doop.c', qr/croak\(PL_no_modify\);/)) {
3045 # Whilst the log suggests that this would only fix 5 commits, in
3046 # practice this area of history is a complete tarpit, and git bisect
3047 # gets very confused by the skips in the middle of the back and
3048 # forth merging between //depot/perl and //depot/cfgperl
3049 apply_commit('6393042b638dafd3');
3050 }
3051
3052 # One error "fixed" with another:
3053 if (extract_from_file('pp_ctl.c',
3054 qr/\Qstatic void *docatch_body _((void *o));\E/)) {
3055 apply_commit('5b51e982882955fe');
3056 }
3057 # Which is then fixed by this:
3058 if (extract_from_file('pp_ctl.c',
3059 qr/\Qstatic void *docatch_body _((valist\E/)) {
3060 apply_commit('47aa779ee4c1a50e');
3061 }
3062
3063 if (extract_from_file('thrdvar.h', qr/PERLVARI\(Tprotect/)
3064 && !extract_from_file('embedvar.h', qr/PL_protect/)) {
3065 # Commit 312caa8e97f1c7ee didn't update embedvar.h
3066 apply_commit('e0284a306d2de082', 'embedvar.h');
3067 }
3068 }
3069
3070 if ($major == 5
3071 && extract_from_file('sv.c',
3072 qr/PerlDir_close\(IoDIRP\((?:\(IO\*\))?sv\)\);/)
3073 && !(extract_from_file('toke.c',
3074 qr/\QIoDIRP(FILTER_DATA(AvFILLp(PL_rsfp_filters))) = NULL\E/)
3075 || extract_from_file('toke.c',
3076 qr/\QIoDIRP(datasv) = (DIR*)NULL;\E/))) {
3077 # Commit 93578b34124e8a3b, //depot/perl@3298
3078 # close directory handles properly when localized,
3079 # tweaked slightly by commit 1236053a2c722e2b,
3080 # add test case for change#3298
3081 #
3082 # The fix is the last part of:
3083 #
3084 # various fixes for clean build and test on win32; configpm broken,
3085 # needed to open myconfig.SH rather than myconfig; sundry adjustments
3086 # to bytecode stuff; tweaks to DYNAMIC_ENV_FETCH code to make it
3087 # work under win32; getenv_sv() changed to getenv_len() since SVs
3088 # aren't visible in the lower echelons; remove bogus exports from
3089 # config.sym; PERL_OBJECT-ness for C++ exception support; null out
3090 # IoDIRP in filter_del() or sv_free() will attempt to close it
3091 #
3092 # The changed code is modified subsequently by commit e0c198038146b7a4
3093 apply_commit('a6c403648ecd5cc7', 'toke.c');
3094 }
3095
bb723266
NC
3096 if ($major < 6 && $^O eq 'netbsd'
3097 && !extract_from_file('unixish.h',
3098 qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) {
3099 apply_patch(<<'EOPATCH')
3100diff --git a/unixish.h b/unixish.h
3101index 2a6cbcd..eab2de1 100644
3102--- a/unixish.h
3103+++ b/unixish.h
3104@@ -89,7 +89,7 @@
3105 */
3106 /* #define ALTERNATE_SHEBANG "#!" / **/
3107
3108-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
3109+#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__)
3110 # include <signal.h>
3111 #endif
3112
3113EOPATCH
3114 }
3115
7ffe6e18
NC
3116 if ($major == 7 && $^O eq 'aix' &&
3117 extract_from_file('ext/List/Util/Util.xs', qr/PUSHBLOCK/)
3118 && !extract_from_file('makedef.pl', qr/^Perl_cxinc/)) {
3119 # Need this to get List::Utils 1.03 and later to compile.
3120 # 1.03 also expects to call Perl_pp_rand. Commit d3632a54487acc5f
3121 # fixes this (for the unthreaded case), but it's not until 1.05,
3122 # two days later, that this is fixed properly.
3123 apply_commit('cbb96eed3f175499');
3124 }
3125
bb723266
NC
3126 if (($major >= 7 || $major <= 9) && $^O eq 'openbsd'
3127 && `uname -m` eq "sparc64\n"
3128 # added in 2000 by commit cb434fcc98ac25f5:
3129 && extract_from_file('regexec.c',
3130 qr!/\* No need to save/restore up to this paren \*/!)
3131 # re-indented in 2006 by commit 95b2444054382532:
3132 && extract_from_file('regexec.c', qr/^\t\tCURCUR cc;$/)) {
3133 # Need to work around a bug in (at least) OpenBSD's 4.6's sparc64 #
3134 # compiler ["gcc (GCC) 3.3.5 (propolice)"]. Between commits
3135 # 3ec562b0bffb8b8b (2002) and 1a4fad37125bac3e^ (2005) the darling thing
3136 # fails to compile any code for the statement cc.oldcc = PL_regcc;
3137 #
3138 # If you refactor the code to "fix" that, or force the issue using set
3139 # in the debugger, the stack smashing detection code fires on return
3140 # from S_regmatch(). Turns out that the compiler doesn't allocate any
3141 # (or at least enough) space for cc.
3142 #
3143 # Restore the "uninitialised" value for cc before function exit, and the
3144 # stack smashing code is placated. "Fix" 3ec562b0bffb8b8b (which
3145 # changes the size of auto variables used elsewhere in S_regmatch), and
3146 # the crash is visible back to bc517b45fdfb539b (which also changes
3147 # buffer sizes). "Unfix" 1a4fad37125bac3e and the crash is visible until
3148 # 5b47454deb66294b. Problem goes away if you compile with -O, or hack
3149 # the code as below.
3150 #
3151 # Hence this turns out to be a bug in (old) gcc. Not a security bug we
3152 # still need to fix.
3153 apply_patch(<<'EOPATCH');
3154diff --git a/regexec.c b/regexec.c
3155index 900b491..6251a0b 100644
3156--- a/regexec.c
3157+++ b/regexec.c
3158@@ -2958,7 +2958,11 @@ S_regmatch(pTHX_ regnode *prog)
3159 I,I
3160 *******************************************************************/
3161 case CURLYX: {
3162- CURCUR cc;
3163+ union {
3164+ CURCUR hack_cc;
3165+ char hack_buff[sizeof(CURCUR) + 1];
3166+ } hack;
3167+#define cc hack.hack_cc
3168 CHECKPOINT cp = PL_savestack_ix;
3169 /* No need to save/restore up to this paren */
3170 I32 parenfloor = scan->flags;
3171@@ -2983,6 +2987,7 @@ S_regmatch(pTHX_ regnode *prog)
3172 n = regmatch(PREVOPER(next)); /* start on the WHILEM */
3173 regcpblow(cp);
3174 PL_regcc = cc.oldcc;
3175+#undef cc
3176 saySAME(n);
3177 }
3178 /* NOT REACHED */
3179EOPATCH
3180}
3181
3182 if ($major < 8 && $^O eq 'openbsd'
3183 && !extract_from_file('perl.h', qr/include <unistd\.h>/)) {
3184 # This is part of commit 3f270f98f9305540, applied at a slightly
3185 # different location in perl.h, where the context is stable back to
3186 # 5.000
3187 apply_patch(<<'EOPATCH');
3188diff --git a/perl.h b/perl.h
3189index 9418b52..b8b1a7c 100644
3190--- a/perl.h
3191+++ b/perl.h
3192@@ -496,6 +496,10 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
3193 # include <sys/param.h>
3194 #endif
3195
3196+/* If this causes problems, set i_unistd=undef in the hint file. */
3197+#ifdef I_UNISTD
3198+# include <unistd.h>
3199+#endif
3200
3201 /* Use all the "standard" definitions? */
3202 #if defined(STANDARD_C) && defined(I_STDLIB)
3203EOPATCH
3204 }
3205}
3206
f2f0a0ff
NC
3207sub patch_ext {
3208 if (-f 'ext/POSIX/Makefile.PL'
3209 && extract_from_file('ext/POSIX/Makefile.PL',
3210 qr/Explicitly avoid including/)) {
3211 # commit 6695a346c41138df, which effectively reverts 170888cff5e2ffb7
3212
3213 # PERL5LIB is populated by make_ext.pl with paths to the modules we need
3214 # to run, don't override this with "../../lib" since that may not have
3215 # been populated yet in a parallel build.
3216 apply_commit('6695a346c41138df');
3217 }
3218
06cebb71
NC
3219 if (-f 'ext/Hash/Util/Makefile.PL'
3220 && extract_from_file('ext/Hash/Util/Makefile.PL',
3221 qr/\bDIR\b.*'FieldHash'/)) {
3222 # ext/Hash/Util/Makefile.PL should not recurse to FieldHash's Makefile.PL
3223 # *nix, VMS and Win32 all know how to (and have to) call the latter directly.
3224 # As is, targets in ext/Hash/Util/FieldHash get called twice, which may result
3225 # in race conditions, and certainly messes up make clean; make distclean;
3226 apply_commit('550428fe486b1888');
3227 }
3228
f2f0a0ff
NC
3229 if ($major < 8 && $^O eq 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') {
3230 checkout_file('ext/DynaLoader/dl_dyld.xs', 'f556e5b971932902');
3231 apply_patch(<<'EOPATCH');
3232diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
3233--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:41:27.000000000 +0100
3234+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 21:42:20.000000000 +0100
3235@@ -41,6 +41,35 @@
3236 #include "perl.h"
3237 #include "XSUB.h"
3238
3239+#ifndef pTHX
3240+# define pTHX void
3241+# define pTHX_
3242+#endif
3243+#ifndef aTHX
3244+# define aTHX
3245+# define aTHX_
3246+#endif
3247+#ifndef dTHX
3248+# define dTHXa(a) extern int Perl___notused(void)
3249+# define dTHX extern int Perl___notused(void)
3250+#endif
3251+
3252+#ifndef Perl_form_nocontext
3253+# define Perl_form_nocontext form
3254+#endif
3255+
3256+#ifndef Perl_warn_nocontext
3257+# define Perl_warn_nocontext warn
3258+#endif
3259+
3260+#ifndef PTR2IV
3261+# define PTR2IV(p) (IV)(p)
3262+#endif
3263+
3264+#ifndef get_av
3265+# define get_av perl_get_av
3266+#endif
3267+
3268 #define DL_LOADONCEONLY
3269
3270 #include "dlutils.c" /* SaveError() etc */
3271@@ -185,7 +191,7 @@
3272 CODE:
3273 DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags));
3274 if (flags & 0x01)
3275- Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename);
3276+ Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename);
3277 RETVAL = dlopen(filename, mode) ;
3278 DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL));
3279 ST(0) = sv_newmortal() ;
3280EOPATCH
3281 if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) {
3282 apply_patch(<<'EOPATCH');
3283diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
3284--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100
3285+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100
3286@@ -60,6 +60,18 @@
3287 # define get_av perl_get_av
3288 #endif
3289
3290+static char *
3291+form(char *pat, ...)
3292+{
3293+ char *retval;
3294+ va_list args;
3295+ va_start(args, pat);
3296+ vasprintf(&retval, pat, &args);
3297+ va_end(args);
3298+ SAVEFREEPV(retval);
3299+ return retval;
3300+}
3301+
3302 #define DL_LOADONCEONLY
3303
3304 #include "dlutils.c" /* SaveError() etc */
3305EOPATCH
3306 }
3307 }
3308
3309 if ($major < 10) {
fbaecb45
NC
3310 if ($unfixable_db_file) {
3311 # Nothing we can do.
f2f0a0ff
NC
3312 } elsif (!extract_from_file('ext/DB_File/DB_File.xs',
3313 qr/^#ifdef AT_LEAST_DB_4_1$/)) {
3314 # This line is changed by commit 3245f0580c13b3ab
3315 my $line = extract_from_file('ext/DB_File/DB_File.xs',
3316 qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/);
3317 apply_patch(<<"EOPATCH");
3318diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
3319index 489ba96..fba8ded 100644
3320--- a/ext/DB_File/DB_File.xs
3321+++ b/ext/DB_File/DB_File.xs
3322\@\@ -183,4 +187,8 \@\@
3323 #endif
3324
3325+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
3326+# define AT_LEAST_DB_4_1
3327+#endif
3328+
3329 /* map version 2 features & constants onto their version 1 equivalent */
3330
3331\@\@ -1334,7 +1419,12 \@\@ SV * sv ;
3332 #endif
3333
3334+#ifdef AT_LEAST_DB_4_1
3335+ status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL, RETVAL->type,
3336+ Flags, mode) ;
3337+#else
3338 $line
3339 Flags, mode) ;
3340+#endif
3341 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */
3342
3343EOPATCH
3344 }
3345 }
3346
3347 if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') {
3348 edit_file('ext/IPC/SysV/SysV.xs', sub {
3349 my $xs = shift;
3350 my $fixed = <<'EOFIX';
3351
3352#include <sys/types.h>
3353#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
3354#ifndef HAS_SEM
3355# include <sys/ipc.h>
3356#endif
3357# ifdef HAS_MSG
3358# include <sys/msg.h>
3359# endif
3360# ifdef HAS_SHM
3361# if defined(PERL_SCO) || defined(PERL_ISC)
3362# include <sys/sysmacros.h> /* SHMLBA */
3363# endif
3364# include <sys/shm.h>
3365# ifndef HAS_SHMAT_PROTOTYPE
3366 extern Shmat_t shmat (int, char *, int);
3367# endif
3368# if defined(HAS_SYSCONF) && defined(_SC_PAGESIZE)
3369# undef SHMLBA /* not static: determined at boot time */
3370# define SHMLBA sysconf(_SC_PAGESIZE)
3371# elif defined(HAS_GETPAGESIZE)
3372# undef SHMLBA /* not static: determined at boot time */
3373# define SHMLBA getpagesize()
3374# endif
3375# endif
3376#endif
3377EOFIX
3378 $xs =~ s!
3379#include <sys/types\.h>
3380.*
3381(#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms;
3382 return $xs;
3383 });
3384 }
3385}
3386
df14fc13
NC
3387sub apply_fixups {
3388 my $fixups = shift;
3389 return unless $fixups;
3390 foreach my $file (@$fixups) {
3391 my $fh = open_or_die($file);
3392 my $line = <$fh>;
3393 close_or_die($fh);
3394 if ($line =~ /^#!perl\b/) {
3395 system $^X, $file
3396 and die_255("$^X $file failed: \$!=$!, \$?=$?");
3397 } elsif ($line =~ /^#!(\/\S+)/) {
3398 system $file
3399 and die_255("$file failed: \$!=$!, \$?=$?");
3400 } else {
3401 if (my ($target, $action, $pattern)
3402 = $line =~ m#^(\S+) ([=!])~ /(.*)/#) {
3403 if (length $pattern) {
3404 next unless -f $target;
3405 if ($action eq '=') {
3406 next unless extract_from_file($target, $pattern);
3407 } else {
3408 next if extract_from_file($target, $pattern);
3409 }
3410 } else {
3411 # Avoid the special case meaning of the empty pattern,
3412 # and instead use this to simply test for the file being
3413 # present or absent
3414 if ($action eq '=') {
3415 next unless -f $target;
3416 } else {
3417 next if -f $target;
3418 }
3419 }
3420 }
3421 system_or_die("patch -p1 <$file");
3422 }
3423 }
3424}
3425
9a999a97
NC
3426# Local variables:
3427# cperl-indent-level: 4
3428# indent-tabs-mode: nil
3429# End:
3430#
3431# ex: set ts=8 sts=4 sw=4 et: