This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
In bisect-runner.pl, consolidate the code that patches .SH and C files.
[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;
69bf9aba 7use Carp;
6a8dbfd7 8
2526f4b8
NC
9my @targets
10 = qw(config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep);
6a8dbfd7 11
e4516dd0
NC
12my $cpus;
13if (open my $fh, '<', '/proc/cpuinfo') {
14 while (<$fh>) {
15 ++$cpus if /^processor\s+:\s+\d+$/;
16 }
d64af352
NC
17} elsif (-x '/sbin/sysctl') {
18 $cpus = 1 + $1 if `/sbin/sysctl hw.ncpu` =~ /^hw\.ncpu: (\d+)$/;
da83cd31
NC
19} elsif (-x '/usr/bin/getconf') {
20 $cpus = 1 + $1 if `/usr/bin/getconf _NPROCESSORS_ONLN` =~ /^(\d+)$/;
e4516dd0
NC
21}
22
f4800c99
NC
23my %options =
24 (
e4516dd0 25 jobs => defined $cpus ? $cpus + 1 : 2,
f4800c99
NC
26 'expect-pass' => 1,
27 clean => 1, # mostly for debugging this
28 );
6a8dbfd7 29
fdbac266
NC
30my $linux64 = `uname -sm` eq "Linux x86_64\n" ? '64' : '';
31
599ee4f7
NC
32my @paths;
33
34if ($^O eq 'linux') {
35 # This is the search logic for a multi-arch library layout
36 # added to linux.sh in commits 40f026236b9959b7 and dcffd848632af2c7.
37 my $gcc = -x '/usr/bin/gcc' ? '/usr/bin/gcc' : 'gcc';
38
39 foreach (`$gcc -print-search-dirs`) {
40 next unless /^libraries: =(.*)/;
41 foreach (split ':', $1) {
42 next if m/gcc/;
43 next unless -d $_;
44 s!/$!!;
45 push @paths, $_;
46 }
47 }
48}
49
50push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib);
390a69a9
NC
51
52my %defines =
53 (
54 usedevel => '',
55 optimize => '-g',
9913adee
NC
56 cc => 'ccache cc',
57 ld => 'cc',
fdbac266 58 ($linux64 ? (libpth => \@paths) : ()),
390a69a9
NC
59 );
60
f4800c99
NC
61unless(GetOptions(\%options,
62 'target=s', 'jobs|j=i', 'expect-pass=i',
63 'expect-fail' => sub { $options{'expect-pass'} = 0; },
64 'clean!', 'one-liner|e=s', 'match=s', 'force-manifest',
77ae6092 65 'test-build', 'check-args', 'A=s@', 'usage|help|?',
390a69a9
NC
66 'D=s@' => sub {
67 my (undef, $val) = @_;
68 if ($val =~ /\A([^=]+)=(.*)/s) {
69 $defines{$1} = length $2 ? $2 : "\0";
70 } else {
71 $defines{$val} = '';
72 }
73 },
74 'U=s@' => sub {
75 $defines{$_[1]} = undef;
76 },
6a8dbfd7 77 )) {
77ae6092 78 pod2usage(exitval => 255, verbose => 1);
6a8dbfd7
NC
79}
80
f4800c99 81my ($target, $j, $match) = @options{qw(target jobs match)};
e295b7be 82
77ae6092
NC
83pod2usage(exitval => 255, verbose => 1) if $options{usage};
84pod2usage(exitval => 255, verbose => 1)
85 unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
6a8dbfd7 86
f4800c99 87exit 0 if $options{'check-args'};
6a8dbfd7 88
77ae6092
NC
89=head1 NAME
90
91bisect.pl - use git bisect to pinpoint changes
92
93=head1 SYNOPSIS
94
95 # When did this become an error?
96 .../Porting/bisect.pl -e 'my $a := 2;'
71d80638 97 # When did this stop being an error?
77ae6092
NC
98 .../Porting/bisect.pl --expect-fail -e '1 // 2'
99 # When did this stop matching?
100 .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
101 # When did this start matching?
102 .../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
103 # When did this test program stop working?
d398528a 104 .../Porting/bisect.pl -- ./perl -Ilib ../test_prog.pl
77ae6092
NC
105 # When did this first become valid syntax?
106 .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
107 --expect-fail -e 'my $a := 2;'
108 # What was the last revision to build with these options?
109 .../Porting/bisect.pl --test-build -Dd_dosuid
110
111=head1 DESCRIPTION
112
facd1b88 113Together F<bisect.pl> and F<bisect-runner.pl> attempt to automate the use
77ae6092
NC
114of C<git bisect> as much as possible. With one command (and no other files)
115it's easy to find out
116
117=over 4
118
119=item *
120
121Which commit caused this example code to break?
122
123=item *
124
125Which commit caused this example code to start working?
126
127=item *
128
129Which commit added the first to match this regex?
130
131=item *
132
133Which commit removed the last to match this regex?
134
135=back
136
137usually without needing to know which versions of perl to use as start and
138end revisions.
139
facd1b88 140By default F<bisect.pl> will process all options, then use the rest of the
77ae6092
NC
141command line as arguments to list C<system> to run a test case. By default,
142the test case should pass (exit with 0) on earlier perls, and fail (exit
facd1b88 143non-zero) on I<blead>. F<bisect.pl> will use F<bisect-runner.pl> to find the
77ae6092 144earliest stable perl version on which the test case passes, check that it
facd1b88 145fails on blead, and then use F<bisect-runner.pl> with C<git bisect run> to
77ae6092
NC
146find the commit which caused the failure.
147
148Because the test case is the complete argument to C<system>, it is easy to
149run something other than the F<perl> built, if necessary. If you need to run
150the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>
151
5842706e
NC
152You need a clean checkout to run a bisect, and you can't use the checkout
153which contains F<Porting/bisect.pl> (because C<git bisect>) will check out
154a revision before F<Porting/bisect-runner.pl> was added, which
155C<git bisect run> needs). If your working checkout is called F<perl>, the
156simplest solution is to make a local clone, and run from that. I<i.e.>:
157
158 cd ..
159 git clone perl perl2
160 cd perl2
161 ../perl/Porting/bisect.pl ...
162
facd1b88 163By default, F<bisect-runner.pl> will automatically disable the build of
cfadff5f
NC
164L<DB_File> for commits earlier than ccb44e3bf3be2c30, as it's not practical
165to patch DB_File 1.70 and earlier to build with current Berkeley DB headers.
166(ccb44e3bf3be2c30 was in September 1999, between 5.005_62 and 5.005_63.)
167If your F<db.h> is old enough you can override this with C<-Unoextensions>.
168
77ae6092
NC
169=head1 OPTIONS
170
171=over 4
172
173=item *
174
175--start I<commit-ish>
176
177Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
facd1b88 178else C<git> understands as a revision). If not specified, F<bisect.pl> will
77ae6092
NC
179search stable perl releases from 5.002 to 5.14.0 until it finds one where
180the test case passes.
181
182=item *
183
184--end I<commit-ish>
185
186Most recent revision to test, as a I<commit-ish>. If not specified, defaults
b4f0ec5f 187to I<blead>.
77ae6092
NC
188
189=item *
190
191--target I<target>
192
193F<Makefile> target (or equivalent) needed, to run the test case. If specified,
194this should be one of
195
196=over 4
197
198=item *
199
200I<config.sh>
201
facd1b88 202Just run F<./Configure>
77ae6092
NC
203
204=item *
205
206I<config.h>
207
208Run the various F<*.SH> files to generate F<Makefile>, F<config.h>, I<etc>.
209
210=item *
211
212I<miniperl>
213
214Build F<miniperl>.
215
216=item *
217
218I<lib/Config.pm>
219
220Use F<miniperl> to build F<lib/Config.pm>
221
222=item *
223
2526f4b8
NC
224I<Fcntl>
225
226Build F<lib/auto/Fcntl/Fnctl.so> (strictly, C<.$Config{so}>). As L<Fcntl>
227is simple XS module present since 5.000, this provides a fast test of
b4f0ec5f 228whether XS modules can be built. Note, XS modules are built by F<miniperl>,
2526f4b8
NC
229hence this target will not build F<perl>.
230
231=item *
232
77ae6092
NC
233I<perl>
234
235Build F<perl>. This also builds pure-Perl modules in F<cpan>, F<dist> and
2526f4b8
NC
236F<ext>. XS modules (such as L<Fcntl>) are not built.
237
238=item *
239
77ae6092
NC
240I<test_prep>
241
242Build everything needed to run the tests. This is the default if we're
243running test code, but is time consuming, as it means building all
b4f0ec5f 244XS modules. For older F<Makefile>s, the previous name of C<test-prep>
77ae6092
NC
245is automatically substituted. For very old F<Makefile>s, C<make test> is
246run, as there is no target provided to just get things ready, and for 5.004
247and earlier the tests run very quickly.
248
249=back
250
251=item *
252
253--one-liner 'code to run'
254
255=item *
256
257-e 'code to run'
258
a1756669 259Example code to run, just like you'd use with C<perl -e>.
77ae6092
NC
260
261This prepends C<./perl -Ilib -e 'code to run'> to the test case given,
facd1b88 262or F<./miniperl> if I<target> is C<miniperl>.
77ae6092
NC
263
264(Usually you'll use C<-e> instead of providing a test case in the
facd1b88 265non-option arguments to F<bisect.pl>)
77ae6092
NC
266
267C<-E> intentionally isn't supported, as it's an error in 5.8.0 and earlier,
268which interferes with detecting errors in the example code itself.
269
270=item *
271
272--expect-fail
273
274The test case should fail for the I<start> revision, and pass for the I<end>
275revision. The bisect run will find the first commit where it passes.
276
277=item *
278
af7c500f 279-Dnoextensions=Encode
77ae6092
NC
280
281=item *
282
283-Uusedevel
284
285=item *
286
287-Accflags=-DNO_MATHOMS
288
289Arguments to pass to F<Configure>. Repeated C<-A> arguments are passed
290through as is. C<-D> and C<-U> are processed in order, and override
af7c500f
NC
291previous settings for the same parameter. F<bisect-runner.pl> emulates
292C<-Dnoextensions> when F<Configure> itself does not provide it, as it's
293often very useful to be able to disable some XS extensions.
77ae6092
NC
294
295=item *
296
b4f0ec5f 297--jobs I<jobs>
77ae6092
NC
298
299=item *
300
b4f0ec5f 301-j I<jobs>
77ae6092 302
da83cd31
NC
303Number of C<make> jobs to run in parallel. If F</proc/cpuinfo> exists and
304can be parsed, or F</sbin/sysctl> exists and reports C<hw.ncpu>, or
305F</usr/bin/getconf> exists and reports C<_NPROCESSORS_ONLN> defaults to 1 +
306I<number of CPUs>. Otherwise defaults to 2.
77ae6092
NC
307
308=item *
309
b4f0ec5f 310--match pattern
77ae6092
NC
311
312Instead of running a test program to determine I<pass> or I<fail>, pass
313if the given regex matches, and hence search for the commit that removes
314the last matching file.
315
316If no I<target> is specified, the match is against all files in the
317repository (which is fast). If a I<target> is specified, that target is
318built, and the match is against only the built files. C<--expect-fail> can
319be used with C<--match> to search for a commit that adds files that match.
320
321=item *
322
323--test-build
324
325Test that the build completes, without running any test case.
326
327By default, if the build for the desired I<target> fails to complete,
328F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
329being that one wants to find a commit which changed state "builds && passes"
330to "builds && fails". If instead one is interested in which commit broke the
331build (possibly for particular F<Configure> options), use I<--test-build>
332to treat a build failure as a failure, not a "skip".
333
b4f0ec5f
NC
334Often this option isn't as useful as it first seems, because I<any> build
335failure will be reported to C<git bisect> as a failure, not just the failure
336that you're interested in. Generally, to debug a particular problem, it's
337more useful to use a I<target> that builds properly at the point of interest,
338and then a test case that runs C<make>. For example:
339
340 .../Porting/bisect.pl --start=perl-5.000 --end=perl-5.002 \
341 --expect-fail --force-manifest --target=miniperl make perl
342
facd1b88
NC
343will find the first revision capable of building L<DynaLoader> and then
344F<perl>, without becoming confused by revisions where F<miniperl> won't
b4f0ec5f
NC
345even link.
346
77ae6092
NC
347=item *
348
b4f0ec5f
NC
349--force-manifest
350
77ae6092
NC
351By default, a build will "skip" if any files listed in F<MANIFEST> are not
352present. Usually this is useful, as it avoids false-failures. However, there
353are some long ranges of commits where listed files are missing, which can
354cause a bisect to abort because all that remain are skipped revisions.
355
356In these cases, particularly if the test case uses F<miniperl> and no modules,
357it may be more useful to force the build to continue, even if files
358F<MANIFEST> are missing.
359
360=item *
361
362--expect-pass [0|1]
363
364C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
365
366=item *
367
368--no-clean
369
370Tell F<bisect-runner.pl> not to clean up after the build. This allows one
371to use F<bisect-runner.pl> to build the current particular perl revision for
372interactive testing, or for debugging F<bisect-runner.pl>.
373
374Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
375
376=item *
377
195ed8b1
NC
378--validate
379
380Test that all stable revisions can be built. Attempts to build I<blead>,
381I<v5.14.0> .. I<perl-5.002>. Stops at the first failure, without cleaning
382the checkout. Ignores I<--start> and I<--end>. Useful for validating a new
383OS/CPU/compiler combination. For example
384
385 ../perl/Porting/bisect.pl --validate -e'print "Hello from $]\n"'
386
387=item *
388
77ae6092
NC
389--check-args
390
391Validate the options and arguments, and exit silently if they are valid.
392
393=item *
394
395--usage
396
397=item *
398
399--help
400
401=item *
402
403-?
404
405Display the usage information and exit.
406
407=back
408
409=cut
410
0afef97d 411die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
6a8dbfd7
NC
412
413$j = "-j$j" if $j =~ /\A\d+\z/;
414
0142f0ce
NC
415# Sadly, however hard we try, I don't think that it will be possible to build
416# modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
417# which updated to MakeMaker 3.7, which changed from using a hard coded ld
418# in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
419
69bf9aba
NC
420sub open_or_die {
421 my $file = shift;
422 my $mode = @_ ? shift : '<';
423 open my $fh, $mode, $file or croak("Can't open $file: $!");
424 ${*$fh{SCALAR}} = $file;
425 return $fh;
426}
427
428sub close_or_die {
429 my $fh = shift;
430 return if close $fh;
431 croak("Can't close: $!") unless ref $fh eq 'GLOB';
432 croak("Can't close ${*$fh{SCALAR}}: $!");
433}
434
6a8dbfd7
NC
435sub extract_from_file {
436 my ($file, $rx, $default) = @_;
69bf9aba 437 my $fh = open_or_die($file);
6a8dbfd7
NC
438 while (<$fh>) {
439 my @got = $_ =~ $rx;
440 return wantarray ? @got : $got[0]
441 if @got;
442 }
443 return $default if defined $default;
444 return;
445}
446
c59e8fd6
NC
447sub edit_file {
448 my ($file, $munger) = @_;
449 local $/;
69bf9aba 450 my $fh = open_or_die($file);
c59e8fd6
NC
451 my $orig = <$fh>;
452 die "Can't read $file: $!" unless defined $orig && close $fh;
453 my $new = $munger->($orig);
454 return if $new eq $orig;
69bf9aba 455 $fh = open_or_die($file, '>');
c59e8fd6 456 print $fh $new or die "Can't print to $file: $!";
69bf9aba 457 close_or_die($fh);
c59e8fd6
NC
458}
459
460sub apply_patch {
461 my $patch = shift;
462
05cd3ce5 463 my ($file) = $patch =~ qr!^--- a/(\S+)\n\+\+\+ b/\1!sm;
c59e8fd6
NC
464 open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
465 print $fh $patch;
5fceabf3
NC
466 return if close $fh;
467 print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
468 die "Can't patch $file: $?, $!";
c59e8fd6
NC
469}
470
4e540a4e
NC
471sub apply_commit {
472 my ($commit, @files) = @_;
473 return unless system "git show $commit @files | patch -p1";
474 die "Can't apply commit $commit to @files" if @files;
475 die "Can't apply commit $commit";
476}
477
478sub revert_commit {
479 my ($commit, @files) = @_;
480 return unless system "git show -R $commit @files | patch -p1";
481 die "Can't apply revert $commit from @files" if @files;
482 die "Can't apply revert $commit";
483}
484
91ad6f8a
NC
485sub checkout_file {
486 my ($file, $commit) = @_;
487 $commit ||= 'blead';
488 system "git show $commit:$file > $file </dev/null"
489 and die "Could not extract $file at revision $commit";
490}
491
ab4a15f9 492sub clean {
f4800c99 493 if ($options{clean}) {
ab4a15f9
NC
494 # Needed, because files that are build products in this checked out
495 # version might be in git in the next desired version.
9da8cb0a 496 system 'git clean -dxf </dev/null';
ab4a15f9
NC
497 # Needed, because at some revisions the build alters checked out files.
498 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
9da8cb0a 499 system 'git reset --hard HEAD </dev/null';
ab4a15f9
NC
500 }
501}
502
503sub skip {
504 my $reason = shift;
505 clean();
506 warn "skipping - $reason";
507 exit 125;
508}
509
f1050811
NC
510sub report_and_exit {
511 my ($ret, $pass, $fail, $desc) = @_;
512
513 clean();
514
f4800c99 515 my $got = ($options{'expect-pass'} ? !$ret : $ret) ? 'good' : 'bad';
f1050811
NC
516 if ($ret) {
517 print "$got - $fail $desc\n";
518 } else {
519 print "$got - $pass $desc\n";
520 }
521
522 exit($got eq 'bad');
523}
524
0afef97d
NC
525sub match_and_exit {
526 my $target = shift;
527 my $matches = 0;
528 my $re = qr/$match/;
529 my @files;
530
531 {
532 local $/ = "\0";
533 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
534 chomp @files;
535 }
536
537 foreach my $file (@files) {
69bf9aba 538 my $fh = open_or_die($file);
0afef97d
NC
539 while (<$fh>) {
540 if ($_ =~ $re) {
541 ++$matches;
542 if (tr/\t\r\n -~\200-\377//c) {
543 print "Binary file $file matches\n";
544 } else {
545 $_ .= "\n" unless /\n\z/;
546 print "$file: $_";
547 }
548 }
549 }
69bf9aba 550 close_or_die($fh);
0afef97d
NC
551 }
552 report_and_exit(!$matches,
553 $matches == 1 ? '1 match for' : "$matches matches for",
554 'no matches for', $match);
555}
556
6a8dbfd7 557# Not going to assume that system perl is yet new enough to have autodie
9da8cb0a 558system 'git clean -dxf </dev/null' and die;
6a8dbfd7 559
0afef97d
NC
560if (!defined $target) {
561 match_and_exit() if $match;
562 $target = 'test_prep';
bc96a05a
NC
563}
564
4b081584
NC
565skip('no Configure - is this the //depot/perlext/Compiler branch?')
566 unless -f 'Configure';
567
dbcdc176
NC
568# This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
569my $major
570 = extract_from_file('patchlevel.h',
571 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
572 0);
573
750ce942
NC
574patch_Configure();
575patch_hints();
576
750ce942
NC
577if ($^O eq 'darwin') {
578 if ($major < 8) {
579 my $faking_it;
580 # We can't build on darwin without some of the data in the hints file.
581 foreach ('ext/DynaLoader/dl_dyld.xs') {
582 next if -f $_;
583 ++$faking_it;
584 checkout_file($_, 'f556e5b971932902');
585 }
586 if ($faking_it) {
587 apply_patch(<<'EOPATCH');
588diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
589--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:41:27.000000000 +0100
590+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 21:42:20.000000000 +0100
591@@ -41,6 +41,35 @@
592 #include "perl.h"
593 #include "XSUB.h"
ac08709a 594
750ce942
NC
595+#ifndef pTHX
596+# define pTHX void
597+# define pTHX_
598+#endif
599+#ifndef aTHX
600+# define aTHX
601+# define aTHX_
602+#endif
603+#ifndef dTHX
604+# define dTHXa(a) extern int Perl___notused(void)
605+# define dTHX extern int Perl___notused(void)
606+#endif
ac08709a 607+
750ce942
NC
608+#ifndef Perl_form_nocontext
609+# define Perl_form_nocontext form
610+#endif
ac08709a 611+
750ce942
NC
612+#ifndef Perl_warn_nocontext
613+# define Perl_warn_nocontext warn
614+#endif
ac08709a 615+
750ce942
NC
616+#ifndef PTR2IV
617+# define PTR2IV(p) (IV)(p)
618+#endif
ac08709a 619+
750ce942
NC
620+#ifndef get_av
621+# define get_av perl_get_av
622+#endif
ac08709a 623+
750ce942 624 #define DL_LOADONCEONLY
915f531b
NC
625
626 #include "dlutils.c" /* SaveError() etc */
627@@ -185,7 +191,7 @@
628 CODE:
629 DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags));
630 if (flags & 0x01)
631- Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename);
632+ Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename);
633 RETVAL = dlopen(filename, mode) ;
634 DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL));
635 ST(0) = sv_newmortal() ;
636EOPATCH
637 if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) {
638 apply_patch(<<'EOPATCH');
639diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
640--- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100
641+++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100
642@@ -60,6 +60,18 @@
643 # define get_av perl_get_av
644 #endif
645
646+static char *
647+form(char *pat, ...)
648+{
649+ char *retval;
650+ va_list args;
651+ va_start(args, pat);
652+ vasprintf(&retval, pat, &args);
653+ va_end(args);
654+ SAVEFREEPV(retval);
750ce942
NC
655+ return retval;
656+}
6f8c21fa 657+
750ce942 658 #define DL_LOADONCEONLY
6f8c21fa 659
750ce942 660 #include "dlutils.c" /* SaveError() etc */
6f8c21fa 661EOPATCH
750ce942
NC
662 }
663 }
664 }
d64af352
NC
665}
666
cfadff5f
NC
667if ($major < 10) {
668 if (!extract_from_file('ext/DB_File/DB_File.xs',
669 qr!^#else /\* Berkeley DB Version > 2 \*/$!)) {
670 # This DB_File.xs is really too old to patch up.
671 # Skip DB_File, unless we're invoked with an explicit -Unoextensions
672 if (!exists $defines{noextensions}) {
673 $defines{noextensions} = 'DB_File';
674 } elsif (defined $defines{noextensions}) {
675 $defines{noextensions} .= ' DB_File';
676 }
677 } elsif (!extract_from_file('ext/DB_File/DB_File.xs',
678 qr/^#ifdef AT_LEAST_DB_4_1$/)) {
679 # This line is changed by commit 3245f0580c13b3ab
680 my $line = extract_from_file('ext/DB_File/DB_File.xs',
681 qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/);
682 apply_patch(<<"EOPATCH");
683diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
684index 489ba96..fba8ded 100644
685--- a/ext/DB_File/DB_File.xs
686+++ b/ext/DB_File/DB_File.xs
687\@\@ -183,4 +187,8 \@\@
688 #endif
689
690+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
691+# define AT_LEAST_DB_4_1
692+#endif
693+
694 /* map version 2 features & constants onto their version 1 equivalent */
695
696\@\@ -1334,7 +1419,12 \@\@ SV * sv ;
697 #endif
698
699+#ifdef AT_LEAST_DB_4_1
700+ status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL, RETVAL->type,
701+ Flags, mode) ;
702+#else
703 $line
704 Flags, mode) ;
705+#endif
706 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */
707
708EOPATCH
709 }
710}
711
6a8dbfd7
NC
712# if Encode is not needed for the test, you can speed up the bisect by
713# excluding it from the runs with -Dnoextensions=Encode
714# ccache is an easy win. Remove it if it causes problems.
6a8dbfd7
NC
715# Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
716# to true in hints/linux.sh
717# On dromedary, from that point on, Configure (by default) fails to find any
718# libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
719# versioned libraries. Without -lm, the build fails.
720# Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
721# until commit faae14e6e968e1c0 adds it to the hints.
722# However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
723# because it will spot versioned libraries, pass them to the compiler, and then
724# bail out pretty early on. Configure won't let us override libswanted, but it
725# will let us override the entire libs list.
726
727unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
728 # Before 1cfa4ec74d4933da, so force the libs list.
729
730 my @libs;
731 # This is the current libswanted list from Configure, less the libs removed
732 # by current hints/linux.sh
733 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld
734 ld sun m crypt sec util c cposix posix ucb BSD)) {
735 foreach my $dir (@paths) {
736 next unless -f "$dir/lib$lib.so";
737 push @libs, "-l$lib";
738 last;
739 }
740 }
390a69a9 741 $defines{libs} = \@libs unless exists $defines{libs};
6a8dbfd7
NC
742}
743
390a69a9
NC
744$defines{usenm} = undef
745 if $major < 2 && !exists $defines{usenm};
0142f0ce 746
67382a3b
NC
747my (@missing, @created_dirs);
748
f4800c99 749if ($options{'force-manifest'}) {
69bf9aba 750 my $fh = open_or_die('MANIFEST');
67382a3b
NC
751 while (<$fh>) {
752 next unless /^(\S+)/;
10c5443e
NC
753 # -d is special case needed (at least) between 27332437a2ed1941 and
754 # bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread
67382a3b 755 push @missing, $1
10c5443e 756 unless -f $1 || -d $1;
67382a3b 757 }
69bf9aba 758 close_or_die($fh);
67382a3b
NC
759
760 foreach my $pathname (@missing) {
761 my @parts = split '/', $pathname;
762 my $leaf = pop @parts;
763 my $path = '.';
764 while (@parts) {
765 $path .= '/' . shift @parts;
766 next if -d $path;
767 mkdir $path, 0700 or die "Can't create $path: $!";
768 unshift @created_dirs, $path;
769 }
69bf9aba
NC
770 $fh = open_or_die($pathname, '>');
771 close_or_die($fh);
67382a3b
NC
772 chmod 0, $pathname or die "Can't chmod 0 $pathname: $!";
773 }
774}
775
af7c500f 776my @ARGS = '-dEs';
390a69a9
NC
777foreach my $key (sort keys %defines) {
778 my $val = $defines{$key};
779 if (ref $val) {
780 push @ARGS, "-D$key=@$val";
781 } elsif (!defined $val) {
782 push @ARGS, "-U$key";
783 } elsif (!length $val) {
784 push @ARGS, "-D$key";
785 } else {
786 $val = "" if $val eq "\0";
787 push @ARGS, "-D$key=$val";
788 }
789}
790push @ARGS, map {"-A$_"} @{$options{A}};
791
6a8dbfd7
NC
792# </dev/null because it seems that some earlier versions of Configure can
793# call commands in a way that now has them reading from stdin (and hanging)
794my $pid = fork;
795die "Can't fork: $!" unless defined $pid;
796if (!$pid) {
7c22f158
NC
797 open STDIN, '<', '/dev/null';
798 # If a file in MANIFEST is missing, Configure asks if you want to
799 # continue (the default being 'n'). With stdin closed or /dev/null,
800 # it exits immediately and the check for config.sh below will skip.
6a8dbfd7
NC
801 exec './Configure', @ARGS;
802 die "Failed to start Configure: $!";
803}
804waitpid $pid, 0
805 or die "wait for Configure, pid $pid failed: $!";
806
bb723266
NC
807patch_SH();
808
af7c500f
NC
809# Emulate noextensions if Configure doesn't support it.
810if (-f 'config.sh') {
811 if ($major < 10 && $defines{noextensions}) {
812 edit_file('config.sh', sub {
813 my @lines = split /\n/, shift;
814 my @ext = split /\s+/, $defines{noextensions};
815 foreach (@lines) {
816 next unless /^extensions=/ || /^dynamic_ext/;
817 foreach my $ext (@ext) {
818 s/\b$ext( )?\b/$1/;
819 }
820 }
821 return join "\n", @lines;
822 });
823 }
824 system './Configure -S </dev/null' and die;
825}
826
0afef97d
NC
827if ($target =~ /config\.s?h/) {
828 match_and_exit($target) if $match && -f $target;
30a13282
NC
829 report_and_exit(!-f $target, 'could build', 'could not build', $target)
830 if $options{'test-build'};
831
832 my $ret = system @ARGV;
833 report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV");
dd4e46d7
NC
834} elsif (!-f 'config.sh') {
835 # Skip if something went wrong with Configure
836
837 skip('could not build config.sh');
838}
6a8dbfd7 839
67382a3b
NC
840# This is probably way too paranoid:
841if (@missing) {
842 my @errors;
eb4906f4 843 require Fcntl;
67382a3b
NC
844 foreach my $file (@missing) {
845 my (undef, undef, $mode, undef, undef, undef, undef, $size)
846 = stat $file;
847 if (!defined $mode) {
848 push @errors, "Added file $file has been deleted by Configure";
849 next;
850 }
eb4906f4 851 if (Fcntl::S_IMODE($mode) != 0) {
67382a3b
NC
852 push @errors,
853 sprintf 'Added file %s had mode changed by Configure to %03o',
854 $file, $mode;
855 }
856 if ($size != 0) {
857 push @errors,
858 "Added file $file had sized changed by Configure to $size";
859 }
860 unlink $file or die "Can't unlink $file: $!";
861 }
862 foreach my $dir (@created_dirs) {
863 rmdir $dir or die "Can't rmdir $dir: $!";
864 }
6c0925a0
NC
865 skip("@errors")
866 if @errors;
67382a3b
NC
867}
868
bb723266 869patch_C();
750ce942
NC
870
871if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') {
872 edit_file('ext/IPC/SysV/SysV.xs', sub {
873 my $xs = shift;
874 my $fixed = <<'EOFIX';
875
876#include <sys/types.h>
877#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
878#ifndef HAS_SEM
879# include <sys/ipc.h>
880#endif
881# ifdef HAS_MSG
882# include <sys/msg.h>
883# endif
884# ifdef HAS_SHM
885# if defined(PERL_SCO) || defined(PERL_ISC)
886# include <sys/sysmacros.h> /* SHMLBA */
887# endif
888# include <sys/shm.h>
889# ifndef HAS_SHMAT_PROTOTYPE
890 extern Shmat_t shmat (int, char *, int);
891# endif
892# if defined(HAS_SYSCONF) && defined(_SC_PAGESIZE)
893# undef SHMLBA /* not static: determined at boot time */
894# define SHMLBA sysconf(_SC_PAGESIZE)
895# elif defined(HAS_GETPAGESIZE)
896# undef SHMLBA /* not static: determined at boot time */
897# define SHMLBA getpagesize()
898# endif
899# endif
900#endif
901EOFIX
902 $xs =~ s!
903#include <sys/types\.h>
904.*
905(#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms;
906 return $xs;
907 });
908}
909
910if (-f 'ext/POSIX/Makefile.PL'
911 && extract_from_file('ext/POSIX/Makefile.PL',
912 qr/Explicitly avoid including/)) {
913 # commit 6695a346c41138df, which effectively reverts 170888cff5e2ffb7
914
915 # PERL5LIB is populated by make_ext.pl with paths to the modules we need
916 # to run, don't override this with "../../lib" since that may not have
917 # been populated yet in a parallel build.
918 apply_commit('6695a346c41138df');
919}
920
921# Parallel build for miniperl is safe
922system "make $j miniperl </dev/null";
923
924my $expected = $target =~ /^test/ ? 't/perl'
925 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
926 : $target;
927my $real_target = $target eq 'Fcntl' ? $expected : $target;
928
929if ($target ne 'miniperl') {
930 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
931 $j = '' if $major < 10;
932
933 if ($real_target eq 'test_prep') {
934 if ($major < 8) {
935 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
936 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
937 # earlier than that, just make test. It will be fast enough.
938 $real_target = extract_from_file('Makefile.SH',
939 qr/^(test[-_]prep):/,
940 'test');
941 }
942 }
943
944 system "make $j $real_target </dev/null";
6f8c21fa
NC
945}
946
750ce942
NC
947my $missing_target = $expected =~ /perl$/ ? !-x $expected : !-r $expected;
948
949if ($options{'test-build'}) {
950 report_and_exit($missing_target, 'could build', 'could not build',
951 $real_target);
952} elsif ($missing_target) {
953 skip("could not build $real_target");
f50dca98
NC
954}
955
750ce942
NC
956match_and_exit($real_target) if $match;
957
958if (defined $options{'one-liner'}) {
959 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
960 unshift @ARGV, "./$exe", '-Ilib', '-e', $options{'one-liner'};
f50dca98
NC
961}
962
750ce942
NC
963# This is what we came here to run:
964
965if (exists $Config{ldlibpthname}) {
966 require Cwd;
967 my $varname = $Config{ldlibpthname};
968 my $cwd = Cwd::getcwd();
969 if (defined $ENV{$varname}) {
970 $ENV{$varname} = $cwd . $Config{path_sep} . $ENV{$varname};
971 } else {
972 $ENV{$varname} = $cwd;
f50dca98 973 }
750ce942
NC
974}
975
976my $ret = system @ARGV;
977
978report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV");
979
980sub patch_Configure {
981 if ($major < 1) {
982 if (extract_from_file('Configure',
983 qr/^\t\t\*=\*\) echo "\$1" >> \$optdef;;$/)) {
984 # This is " Spaces now allowed in -D command line options.",
985 # part of commit ecfc54246c2a6f42
986 apply_patch(<<'EOPATCH');
987diff --git a/Configure b/Configure
988index 3d3b38d..78ffe16 100755
989--- a/Configure
990+++ b/Configure
991@@ -652,7 +777,8 @@ while test $# -gt 0; do
992 echo "$me: use '-U symbol=', not '-D symbol='." >&2
993 echo "$me: ignoring -D $1" >&2
994 ;;
995- *=*) echo "$1" >> $optdef;;
996+ *=*) echo "$1" | \
997+ sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
998 *) echo "$1='define'" >> $optdef;;
999 esac
1000 shift
1001EOPATCH
1002 }
1003
1004 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
1005 # Configure's original simple "grep" for d_namlen falls foul of the
1006 # approach taken by the glibc headers:
1007 # #ifdef _DIRENT_HAVE_D_NAMLEN
1008 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
1009 #
1010 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
1011 # This is also part of commit ecfc54246c2a6f42
1012 apply_patch(<<'EOPATCH');
1013diff --git a/Configure b/Configure
1014index 3d3b38d..78ffe16 100755
1015--- a/Configure
1016+++ b/Configure
1017@@ -3935,7 +4045,8 @@ $rm -f try.c
1018
1019 : see if the directory entry stores field length
1020 echo " "
1021-if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
1022+$cppstdin $cppflags $cppminus < "$xinc" > try.c
1023+if $contains 'd_namlen' try.c >/dev/null 2>&1; then
1024 echo "Good, your directory entry keeps length information in d_namlen." >&4
1025 val="$define"
1026 else
1027EOPATCH
1028 }
f50dca98 1029 }
750ce942
NC
1030
1031 if ($major < 2
1032 && !extract_from_file('Configure',
1033 qr/Try to guess additional flags to pick up local libraries/)) {
1034 my $mips = extract_from_file('Configure',
1035 qr!(''\) if (?:\./)?mips; then)!);
1036 # This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to
1037 # theld flags if libraries are found there. It shifts the code to set up
1038 # libpth earlier, and then adds the code to add libpth entries to
1039 # ldflags
1040 # mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g
1041 apply_patch(sprintf <<'EOPATCH', $mips);
1042diff --git a/Configure b/Configure
1043index 53649d5..0635a6e 100755
1044--- a/Configure
1045+++ b/Configure
1046@@ -2749,6 +2749,52 @@ EOM
1047 ;;
1048 esac
f50dca98 1049
750ce942
NC
1050+: Set private lib path
1051+case "$plibpth" in
1052+'') if ./mips; then
1053+ plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
1054+ fi;;
1055+esac
1056+case "$libpth" in
1057+' ') dlist='';;
1058+'') dlist="$plibpth $glibpth";;
1059+*) dlist="$libpth";;
1060+esac
1061+
1062+: Now check and see which directories actually exist, avoiding duplicates
1063+libpth=''
1064+for xxx in $dlist
1065+do
1066+ if $test -d $xxx; then
1067+ case " $libpth " in
1068+ *" $xxx "*) ;;
1069+ *) libpth="$libpth $xxx";;
1070+ esac
1071+ fi
1072+done
1073+$cat <<'EOM'
1074+
1075+Some systems have incompatible or broken versions of libraries. Among
1076+the directories listed in the question below, please remove any you
1077+know not to be holding relevant libraries, and add any that are needed.
1078+Say "none" for none.
1079+
1080+EOM
1081+case "$libpth" in
1082+'') dflt='none';;
1083+*)
1084+ set X $libpth
1085+ shift
1086+ dflt=${1+"$@"}
1087+ ;;
1088+esac
1089+rp="Directories to use for library searches?"
1090+. ./myread
1091+case "$ans" in
1092+none) libpth=' ';;
1093+*) libpth="$ans";;
1094+esac
1095+
1096 : flags used in final linking phase
1097 case "$ldflags" in
1098 '') if ./venix; then
1099@@ -2765,6 +2811,23 @@ case "$ldflags" in
1100 ;;
1101 *) dflt="$ldflags";;
1102 esac
1103+
1104+: Possible local library directories to search.
1105+loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
1106+loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
1107+
1108+: Try to guess additional flags to pick up local libraries.
1109+for thislibdir in $libpth; do
1110+ case " $loclibpth " in
1111+ *" $thislibdir "*)
1112+ case "$dflt " in
1113+ "-L$thislibdir ") ;;
1114+ *) dflt="$dflt -L$thislibdir" ;;
1115+ esac
1116+ ;;
1117+ esac
1118+done
1119+
1120 echo " "
1121 rp="Any additional ld flags (NOT including libraries)?"
1122 . ./myread
1123@@ -2828,52 +2891,6 @@ n) echo "OK, that should do.";;
1124 esac
1125 $rm -f try try.* core
1126
1127-: Set private lib path
1128-case "$plibpth" in
1129-%s
1130- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
1131- fi;;
1132-esac
1133-case "$libpth" in
1134-' ') dlist='';;
1135-'') dlist="$plibpth $glibpth";;
1136-*) dlist="$libpth";;
1137-esac
1138-
1139-: Now check and see which directories actually exist, avoiding duplicates
1140-libpth=''
1141-for xxx in $dlist
1142-do
1143- if $test -d $xxx; then
1144- case " $libpth " in
1145- *" $xxx "*) ;;
1146- *) libpth="$libpth $xxx";;
1147- esac
1148- fi
1149-done
1150-$cat <<'EOM'
f50dca98 1151-
750ce942
NC
1152-Some systems have incompatible or broken versions of libraries. Among
1153-the directories listed in the question below, please remove any you
1154-know not to be holding relevant libraries, and add any that are needed.
1155-Say "none" for none.
1156-
1157-EOM
1158-case "$libpth" in
1159-'') dflt='none';;
1160-*)
1161- set X $libpth
1162- shift
1163- dflt=${1+"$@"}
1164- ;;
1165-esac
1166-rp="Directories to use for library searches?"
1167-. ./myread
1168-case "$ans" in
1169-none) libpth=' ';;
1170-*) libpth="$ans";;
1171-esac
1172-
1173 : compute shared library extension
1174 case "$so" in
1175 '')
f50dca98
NC
1176EOPATCH
1177 }
686af304 1178
750ce942
NC
1179 if ($major < 5 && extract_from_file('Configure',
1180 qr!if \$cc \$ccflags try\.c -o try >/dev/null 2>&1; then!)) {
1181 # Analogous to the more general fix of dfe9444ca7881e71
1182 # Without this flags such as -m64 may not be passed to this compile,
1183 # which results in a byteorder of '1234' instead of '12345678', which
1184 # can then cause crashes.
686af304 1185
750ce942
NC
1186 if (extract_from_file('Configure', qr/xxx_prompt=y/)) {
1187 # 8e07c86ebc651fe9 or later
1188 # ("This is my patch patch.1n for perl5.001.")
1189 apply_patch(<<'EOPATCH');
1190diff --git a/Configure b/Configure
1191index 62249dd..c5c384e 100755
1192--- a/Configure
1193+++ b/Configure
1194@@ -8247,7 +8247,7 @@ main()
1195 }
1196 EOCP
1197 xxx_prompt=y
1198- if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
1199+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
1200 dflt=`./try`
1201 case "$dflt" in
1202 [1-4][1-4][1-4][1-4]|12345678|87654321)
1203EOPATCH
1204 } else {
1205 apply_patch(<<'EOPATCH');
1206diff --git a/Configure b/Configure
1207index 53649d5..f1cd64a 100755
1208--- a/Configure
1209+++ b/Configure
1210@@ -6362,7 +6362,7 @@ main()
1211 printf("\n");
1212 }
1213 EOCP
1214- if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
1215+ if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 ; then
1216 dflt=`./try`
1217 case "$dflt" in
1218 ????|????????) echo "(The test program ran ok.)";;
1219EOPATCH
1220 }
1221 }
9a999a97 1222
750ce942
NC
1223 if ($major < 6 && !extract_from_file('Configure',
1224 qr!^\t-A\)$!)) {
1225 # This adds the -A option to Configure, which is incredibly useful
1226 # Effectively this is commits 02e93a22d20fc9a5, 5f83a3e9d818c3ad,
1227 # bde6b06b2c493fef, f7c3111703e46e0c and 2 lines of trailing whitespace
1228 # removed by 613d6c3e99b9decc, but applied at slightly different
1229 # locations to ensure a clean patch back to 5.000
1230 # Note, if considering patching to the intermediate revisions to fix
1231 # bugs in -A handling, f7c3111703e46e0c is from 2002, and hence
1232 # $major == 8
1233
1234 # To add to the fun, early patches add -K and -O options, and it's not
1235 # trivial to get patch to put the C<. ./posthint.sh> in the right place
1236 edit_file('Configure', sub {
1237 my $code = shift;
1238 $code =~ s/(optstr = ")([^"]+";\s*# getopt-style specification)/$1A:$2/
1239 or die "Substitution failed";
1240 $code =~ s!^(: who configured the system)!
1241touch posthint.sh
1242. ./posthint.sh
2526f4b8 1243
750ce942
NC
1244$1!ms
1245 or die "Substitution failed";
1246 return $code;
1247 });
1248 apply_patch(<<'EOPATCH');
1249diff --git a/Configure b/Configure
1250index 4b55fa6..60c3c64 100755
1251--- a/Configure
1252+++ b/Configure
1253@@ -1150,6 +1150,7 @@ set X `for arg in "$@"; do echo "X$arg"; done |
1254 eval "set $*"
1255 shift
1256 rm -f options.awk
1257+rm -f posthint.sh
1258
1259 : set up default values
1260 fastread=''
1261@@ -1172,6 +1173,56 @@ while test $# -gt 0; do
1262 case "$1" in
1263 -d) shift; fastread=yes;;
1264 -e) shift; alldone=cont;;
1265+ -A)
1266+ shift
1267+ xxx=''
1268+ yyy="$1"
1269+ zzz=''
1270+ uuu=undef
1271+ case "$yyy" in
1272+ *=*) zzz=`echo "$yyy"|sed 's!=.*!!'`
1273+ case "$zzz" in
1274+ *:*) zzz='' ;;
1275+ *) xxx=append
1276+ zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'`
1277+ yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
1278+ esac
1279+ ;;
1280+ esac
1281+ case "$xxx" in
1282+ '') case "$yyy" in
1283+ *:*) xxx=`echo "$yyy"|sed 's!:.*!!'`
1284+ yyy=`echo "$yyy"|sed 's!^[^:]*:!!'`
1285+ zzz=`echo "$yyy"|sed 's!^[^=]*=!!'`
1286+ yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
1287+ *) xxx=`echo "$yyy"|sed 's!:.*!!'`
1288+ yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;;
1289+ esac
1290+ ;;
1291+ esac
1292+ case "$xxx" in
1293+ append)
1294+ echo "$yyy=\"\${$yyy}$zzz\"" >> posthint.sh ;;
1295+ clear)
1296+ echo "$yyy=''" >> posthint.sh ;;
1297+ define)
1298+ case "$zzz" in
1299+ '') zzz=define ;;
1300+ esac
1301+ echo "$yyy='$zzz'" >> posthint.sh ;;
1302+ eval)
1303+ echo "eval \"$yyy=$zzz\"" >> posthint.sh ;;
1304+ prepend)
1305+ echo "$yyy=\"$zzz\${$yyy}\"" >> posthint.sh ;;
1306+ undef)
1307+ case "$zzz" in
1308+ '') zzz="$uuu" ;;
1309+ esac
1310+ echo "$yyy=$zzz" >> posthint.sh ;;
1311+ *) echo "$me: unknown -A command '$xxx', ignoring -A $1" >&2 ;;
1312+ esac
1313+ shift
1314+ ;;
1315 -f)
1316 shift
1317 cd ..
1318EOPATCH
1319 }
9a999a97 1320
750ce942
NC
1321 if ($major < 8 && !extract_from_file('Configure',
1322 qr/^\t\tif test ! -t 0; then$/)) {
1323 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was
1324 # not a tty. With that commit, the tty requirement was dropped for -de
1325 # and -dE
1326 # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S
1327 # For those older versions, it's probably easiest if we simply remove
1328 # the sanity test.
1329 edit_file('Configure', sub {
1330 my $code = shift;
1331 $code =~ s/test ! -t 0/test Perl = rules/;
1332 return $code;
1333 });
6a8dbfd7 1334 }
6a8dbfd7 1335
750ce942
NC
1336 if ($major == 8 || $major == 9) {
1337 # Fix symbol detection to that of commit 373dfab3839ca168 if it's any
1338 # intermediate version 5129fff43c4fe08c or later, as the intermediate
1339 # versions don't work correctly on (at least) Sparc Linux.
1340 # 5129fff43c4fe08c adds the first mention of mistrustnm.
1341 # 373dfab3839ca168 removes the last mention of lc=""
1342 edit_file('Configure', sub {
1343 my $code = shift;
1344 return $code
1345 if $code !~ /\btc="";/; # 373dfab3839ca168 or later
1346 return $code
1347 if $code !~ /\bmistrustnm\b/; # before 5129fff43c4fe08c
1348 my $fixed = <<'EOC';
6a8dbfd7 1349
750ce942
NC
1350: is a C symbol defined?
1351csym='tlook=$1;
1352case "$3" in
1353-v) tf=libc.tmp; tdc="";;
1354-a) tf=libc.tmp; tdc="[]";;
1355*) tlook="^$1\$"; tf=libc.list; tdc="()";;
1356esac;
1357tx=yes;
1358case "$reuseval-$4" in
1359true-) ;;
1360true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;;
1361esac;
1362case "$tx" in
1363yes)
1364 tval=false;
1365 if $test "$runnm" = true; then
1366 if $contains $tlook $tf >/dev/null 2>&1; then
1367 tval=true;
1368 elif $test "$mistrustnm" = compile -o "$mistrustnm" = run; then
1369 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
1370 $cc -o try $optimize $ccflags $ldflags try.c >/dev/null 2>&1 $libs && tval=true;
1371 $test "$mistrustnm" = run -a -x try && { $run ./try$_exe >/dev/null 2>&1 || tval=false; };
1372 $rm -f try$_exe try.c core core.* try.core;
1373 fi;
1374 else
1375 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
1376 $cc -o try $optimize $ccflags $ldflags try.c $libs >/dev/null 2>&1 && tval=true;
1377 $rm -f try$_exe try.c;
1378 fi;
1379 ;;
1380*)
1381 case "$tval" in
1382 $define) tval=true;;
1383 *) tval=false;;
1384 esac;
1385 ;;
1386esac;
1387eval "$2=$tval"'
67382a3b 1388
750ce942
NC
1389EOC
1390 $code =~ s/\n: is a C symbol defined\?\n.*?\neval "\$2=\$tval"'\n\n/$fixed/sm
1391 or die "substitution failed";
1392 return $code;
1393 });
1394 }
1395
1396 if ($major < 10
1397 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
1398 # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as
1399 # prior to bd9b35c97ad661cc Configure had the malloc.h test before the
1400 # definition of $compile.
1401 apply_patch(<<'EOPATCH');
1402diff --git a/Configure b/Configure
1403index 3d2e8b9..6ce7766 100755
1404--- a/Configure
1405+++ b/Configure
1406@@ -6743,5 +6743,22 @@ set d_dosuid
1407
1408 : see if this is a malloc.h system
1409-set malloc.h i_malloc
1410-eval $inhdr
1411+: we want a real compile instead of Inhdr because some systems have a
1412+: malloc.h that just gives a compile error saying to use stdlib.h instead
1413+echo " "
1414+$cat >try.c <<EOCP
1415+#include <stdlib.h>
1416+#include <malloc.h>
1417+int main () { return 0; }
1418+EOCP
1419+set try
1420+if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then
1421+ echo "<malloc.h> found." >&4
1422+ val="$define"
1423+else
1424+ echo "<malloc.h> NOT found." >&4
1425+ val="$undef"
1426+fi
1427+$rm -f try.c try
1428+set i_malloc
1429+eval $setvar
1430
1431EOPATCH
1432 }
67382a3b 1433}
6a8dbfd7 1434
750ce942
NC
1435sub patch_hints {
1436 if ($^O eq 'freebsd') {
1437 # There are rather too many version-specific FreeBSD hints fixes to
1438 # patch individually. Also, more than once the FreeBSD hints file has
1439 # been written in what turned out to be a rather non-future-proof style,
1440 # with case statements treating the most recent version as the
1441 # exception, instead of treating previous versions' behaviour explicitly
1442 # and changing the default to cater for the current behaviour. (As
1443 # strangely, future versions inherit the current behaviour.)
1444 checkout_file('hints/freebsd.sh');
1445 } elsif ($^O eq 'darwin') {
1446 if ($major < 8) {
1447 # We can't build on darwin without some of the data in the hints
1448 # file. Probably less surprising to use the earliest version of
1449 # hints/darwin.sh and then edit in place just below, than use
1450 # blead's version, as that would create a discontinuity at
1451 # f556e5b971932902 - before it, hints bugs would be "fixed", after
1452 # it they'd resurface. This way, we should give the illusion of
1453 # monotonic bug fixing.
1454 my $faking_it;
1455 if (!-f 'hints/darwin.sh') {
1456 checkout_file('hints/darwin.sh', 'f556e5b971932902');
1457 ++$faking_it;
1458 }
0afef97d 1459
750ce942
NC
1460 edit_file('hints/darwin.sh', sub {
1461 my $code = shift;
1462 # Part of commit 8f4f83badb7d1ba9, which mostly undoes
1463 # commit 0511a818910f476c.
1464 $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m;
1465 # commit 14c11978e9b52e08/803bb6cc74d36a3f
1466 # Without this, code in libperl.bundle links against op.o
1467 # in preference to opmini.o on the linker command line,
1468 # and hence miniperl tries to use File::Glob instead of
1469 # csh
1470 $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m;
1471 # f556e5b971932902 also patches Makefile.SH with some
1472 # special case code to deal with useshrplib for darwin.
1473 # Given that post 5.8.0 the darwin hints default was
1474 # changed to false, and it would be very complex to splice
1475 # in that code in various versions of Makefile.SH back
1476 # to 5.002, lets just turn it off.
1477 $code =~ s/^useshrplib='true'/useshrplib='false'/m
1478 if $faking_it;
1479 return $code;
1480 });
1481 }
1482 } elsif ($^O eq 'netbsd') {
1483 if ($major < 6) {
1484 # These are part of commit 099685bc64c7dbce
1485 edit_file('hints/netbsd.sh', sub {
1486 my $code = shift;
1487 my $fixed = <<'EOC';
1488case "$osvers" in
14890.9|0.8*)
1490 usedl="$undef"
1491 ;;
1492*)
1493 if [ -f /usr/libexec/ld.elf_so ]; then
1494 d_dlopen=$define
1495 d_dlerror=$define
1496 ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
1497 cccdlflags="-DPIC -fPIC $cccdlflags"
1498 lddlflags="--whole-archive -shared $lddlflags"
1499 elif [ "`uname -m`" = "pmax" ]; then
1500# NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work.
1501 d_dlopen=$undef
1502 elif [ -f /usr/libexec/ld.so ]; then
1503 d_dlopen=$define
1504 d_dlerror=$define
1505 ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags"
1506# we use -fPIC here because -fpic is *NOT* enough for some of the
1507# extensions like Tk on some netbsd platforms (the sparc is one)
1508 cccdlflags="-DPIC -fPIC $cccdlflags"
1509 lddlflags="-Bforcearchive -Bshareable $lddlflags"
1510 else
1511 d_dlopen=$undef
1512 fi
1513 ;;
1514esac
1515EOC
1516 $code =~ s/^case "\$osvers" in\n0\.9\|0\.8.*?^esac\n/$fixed/ms;
1517 return $code;
1518 });
1519 }
1520 } elsif ($^O eq 'openbsd') {
1521 if ($major < 8) {
1522 checkout_file('hints/openbsd.sh', '43051805d53a3e4c')
1523 unless -f 'hints/openbsd.sh';
1524 my $which = extract_from_file('hints/openbsd.sh',
1525 qr/# from (2\.8|3\.1) onwards/,
1526 '');
1527 if ($which eq '') {
1528 my $was = extract_from_file('hints/openbsd.sh',
1529 qr/(lddlflags="(?:-Bforcearchive )?-Bshareable)/);
1530 # This is commit 154d43cbcf57271c and parts of 5c75dbfa77b0949c
1531 # and 29b5585702e5e025
1532 apply_patch(sprintf <<'EOPATCH', $was);
1533diff --git a/hints/openbsd.sh b/hints/openbsd.sh
1534index a7d8bf2..5b79709 100644
1535--- a/hints/openbsd.sh
1536+++ b/hints/openbsd.sh
1537@@ -37,7 +37,25 @@ OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax)
1538 # we use -fPIC here because -fpic is *NOT* enough for some of the
1539 # extensions like Tk on some OpenBSD platforms (ie: sparc)
1540 cccdlflags="-DPIC -fPIC $cccdlflags"
1541- %s $lddlflags"
1542+ case "$osvers" in
1543+ [01].*|2.[0-7]|2.[0-7].*)
1544+ lddlflags="-Bshareable $lddlflags"
1545+ ;;
1546+ 2.[8-9]|3.0)
1547+ ld=${cc:-cc}
1548+ lddlflags="-shared -fPIC $lddlflags"
1549+ ;;
1550+ *) # from 3.1 onwards
1551+ ld=${cc:-cc}
1552+ lddlflags="-shared -fPIC $lddlflags"
1553+ libswanted=`echo $libswanted | sed 's/ dl / /'`
1554+ ;;
1555+ esac
1556+
1557+ # We need to force ld to export symbols on ELF platforms.
1558+ # Without this, dlopen() is crippled.
1559+ ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
1560+ test -n "$ELF" && ldflags="-Wl,-E $ldflags"
1561 ;;
1562 esac
1563
1564EOPATCH
1565 } elsif ($which eq '2.8') {
1566 # This is parts of 5c75dbfa77b0949c and 29b5585702e5e025, and
1567 # possibly eb9cd59d45ad2908
1568 my $was = extract_from_file('hints/openbsd.sh',
1569 qr/lddlflags="(-shared(?: -fPIC)?) \$lddlflags"/);
0afef97d 1570
750ce942
NC
1571 apply_patch(sprintf <<'EOPATCH', $was);
1572--- a/hints/openbsd.sh 2011-10-21 17:25:20.000000000 +0200
1573+++ b/hints/openbsd.sh 2011-10-21 16:58:43.000000000 +0200
1574@@ -44,11 +44,21 @@
1575 [01].*|2.[0-7]|2.[0-7].*)
1576 lddlflags="-Bshareable $lddlflags"
1577 ;;
1578- *) # from 2.8 onwards
1579+ 2.[8-9]|3.0)
1580 ld=${cc:-cc}
1581- lddlflags="%s $lddlflags"
1582+ lddlflags="-shared -fPIC $lddlflags"
1583+ ;;
1584+ *) # from 3.1 onwards
1585+ ld=${cc:-cc}
1586+ lddlflags="-shared -fPIC $lddlflags"
1587+ libswanted=`echo $libswanted | sed 's/ dl / /'`
1588 ;;
1589 esac
1590+
1591+ # We need to force ld to export symbols on ELF platforms.
1592+ # Without this, dlopen() is crippled.
1593+ ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
1594+ test -n "$ELF" && ldflags="-Wl,-E $ldflags"
1595 ;;
1596 esac
1597
1598EOPATCH
1599 } elsif ($which eq '3.1'
1600 && !extract_from_file('hints/openbsd.sh',
1601 qr/We need to force ld to export symbols on ELF platforms/)) {
1602 # This is part of 29b5585702e5e025
1603 apply_patch(<<'EOPATCH');
1604diff --git a/hints/openbsd.sh b/hints/openbsd.sh
1605index c6b6bc9..4839d04 100644
1606--- a/hints/openbsd.sh
1607+++ b/hints/openbsd.sh
1608@@ -54,6 +54,11 @@ alpha-2.[0-8]|mips-*|vax-*|powerpc-2.[0-7]|m88k-*)
1609 libswanted=`echo $libswanted | sed 's/ dl / /'`
1610 ;;
1611 esac
1612+
1613+ # We need to force ld to export symbols on ELF platforms.
1614+ # Without this, dlopen() is crippled.
1615+ ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
1616+ test -n "$ELF" && ldflags="-Wl,-E $ldflags"
1617 ;;
1618 esac
1619
1620EOPATCH
1621 }
1622 }
1623 } elsif ($^O eq 'linux') {
1624 if ($major < 1) {
1625 # sparc linux seems to need the -Dbool=char -DHAS_BOOL part of
1626 # perl5.000 patch.0n: [address Configure and build issues]
1627 edit_file('hints/linux.sh', sub {
1628 my $code = shift;
1629 $code =~ s!-I/usr/include/bsd!-Dbool=char -DHAS_BOOL!g;
1630 return $code;
1631 });
1632 }
915f531b 1633
750ce942
NC
1634 if ($major <= 9) {
1635 if (`uname -sm` =~ qr/^Linux sparc/) {
1636 if (extract_from_file('hints/linux.sh', qr/sparc-linux/)) {
1637 # Be sure to use -fPIC not -fpic on Linux/SPARC
1638 apply_commit('f6527d0ef0c13ad4');
1639 } elsif(!extract_from_file('hints/linux.sh',
1640 qr/^sparc-linux\)$/)) {
1641 my $fh = open_or_die('hints/linux.sh', '>>');
1642 print $fh <<'EOT' or die $!;
1643
1644case "`uname -m`" in
1645sparc*)
1646 case "$cccdlflags" in
1647 *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
1648 *) cccdlflags="$cccdlflags -fPIC" ;;
1649 esac
1650 ;;
1651esac
1652EOT
1653 close_or_die($fh);
1654 }
1655 }
1656 }
915f531b
NC
1657 }
1658}
1659
bb723266
NC
1660sub patch_SH {
1661 # Cwd.xs added in commit 0d2079faa739aaa9. Cwd.pm moved to ext/ 8 years
1662 # later in commit 403f501d5b37ebf0
1663 if ($major > 0 && <*/Cwd/Cwd.xs>) {
1664 if ($major < 10
1665 && !extract_from_file('Makefile.SH', qr/^extra_dep=''$/)) {
1666 # The Makefile.PL for Unicode::Normalize needs
1667 # lib/unicore/CombiningClass.pl. Even without a parallel build, we
1668 # need a dependency to ensure that it builds. This is a variant of
1669 # commit 9f3ef600c170f61e. Putting this for earlier versions gives
1670 # us a spot on which to hang the edits below
1671 apply_patch(<<'EOPATCH');
1672diff --git a/Makefile.SH b/Makefile.SH
1673index f61d0db..6097954 100644
1674--- a/Makefile.SH
1675+++ b/Makefile.SH
1676@@ -155,10 +155,20 @@ esac
1677
1678 : Prepare dependency lists for Makefile.
1679 dynamic_list=' '
1680+extra_dep=''
1681 for f in $dynamic_ext; do
1682 : the dependency named here will never exist
1683 base=`echo "$f" | sed 's/.*\///'`
1684- dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
1685+ this_target="lib/auto/$f/$base.$dlext"
1686+ dynamic_list="$dynamic_list $this_target"
1687+
1688+ : Parallel makes reveal that we have some interdependencies
1689+ case $f in
1690+ Math/BigInt/FastCalc) extra_dep="$extra_dep
1691+$this_target: lib/auto/List/Util/Util.$dlext" ;;
1692+ Unicode/Normalize) extra_dep="$extra_dep
1693+$this_target: lib/unicore/CombiningClass.pl" ;;
1694+ esac
1695 done
1696
1697 static_list=' '
1698@@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
1699 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
1700+!NO!SUBS!
1701+
1702+$spitshell >>Makefile <<EOF
1703+$extra_dep
1704+EOF
1705+
1706+$spitshell >>Makefile <<'!NO!SUBS!'
1707
1708EOPATCH
1709 }
1710 if ($major < 14) {
1711 # Commits dc0655f797469c47 and d11a62fe01f2ecb2
1712 edit_file('Makefile.SH', sub {
1713 my $code = shift;
1714 foreach my $ext (qw(Encode SDBM_File)) {
1715 next if $code =~ /\b$ext\) extra_dep=/s;
1716 $code =~ s!(\) extra_dep="\$extra_dep
1717\$this_target: .*?" ;;)
1718( esac
1719)!$1
1720 $ext) extra_dep="\$extra_dep
1721\$this_target: lib/auto/Cwd/Cwd.\$dlext" ;;
1722$2!;
1723 }
1724 return $code;
1725 });
1726 }
1727 }
1728
1729 if ($major == 7) {
1730 # Remove commits 9fec149bb652b6e9 and 5bab1179608f81d8, which add/amend
1731 # rules to automatically run regen scripts that rebuild C headers. These
1732 # cause problems because a git checkout doesn't preserve relative file
1733 # modification times, hence the regen scripts may fire. This will
1734 # obscure whether the repository had the correct generated headers
1735 # checked in.
1736 # Also, the dependency rules for running the scripts were not correct,
1737 # which could cause spurious re-builds on re-running make, and can cause
1738 # complete build failures for a parallel make.
1739 if (extract_from_file('Makefile.SH',
1740 qr/Writing it this way gives make a big hint to always run opcode\.pl before/)) {
1741 apply_commit('70c6e6715e8fec53');
1742 } elsif (extract_from_file('Makefile.SH',
1743 qr/^opcode\.h opnames\.h pp_proto\.h pp\.sym: opcode\.pl$/)) {
1744 revert_commit('9fec149bb652b6e9');
1745 }
1746 }
1747
1748 # There was a bug in makedepend.SH which was fixed in version 96a8704c.
1749 # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
1750 # Remove this if you're actually bisecting a problem related to
1751 # makedepend.SH
1752 # If you do this, you may need to add in code to correct the output of older
1753 # makedepends, which don't correctly filter newer gcc output such as
1754 # <built-in>
1755 checkout_file('makedepend.SH');
1756
1757 if ($major < 4 && -f 'config.sh'
1758 && !extract_from_file('config.sh', qr/^trnl=/)) {
1759 # This seems to be necessary to avoid makedepend becoming confused,
1760 # and hanging on stdin. Seems that the code after
1761 # make shlist || ...here... is never run.
1762 edit_file('makedepend.SH', sub {
1763 my $code = shift;
1764 $code =~ s/^trnl='\$trnl'$/trnl='\\n'/m;
1765 return $code;
1766 });
1767 }
1768}
1769
1770sub patch_C {
1771 # This is ordered by $major, as it's likely that different platforms may
1772 # well want to share code.
1773
1774 if ($major == 2 && extract_from_file('perl.c', qr/^\tfclose\(e_fp\);$/)) {
1775 # need to patch perl.c to avoid calling fclose() twice on e_fp when
1776 # using -e
1777 # This diff is part of commit ab821d7fdc14a438. The second close was
1778 # introduced with perl-5.002, commit a5f75d667838e8e7
1779 # Might want a6c477ed8d4864e6 too, for the corresponding change to
1780 # pp_ctl.c (likely without this, eval will have "fun")
1781 apply_patch(<<'EOPATCH');
1782diff --git a/perl.c b/perl.c
1783index 03c4d48..3c814a2 100644
1784--- a/perl.c
1785+++ b/perl.c
1786@@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
1787 #ifndef VMS /* VMS doesn't have environ array */
1788 origenviron = environ;
1789 #endif
1790+ e_tmpname = Nullch;
1791
1792 if (do_undump) {
1793
1794@@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
1795 if (e_fp) {
1796 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
1797 croak("Can't write to temp file for -e: %s", Strerror(errno));
1798+ e_fp = Nullfp;
1799 argc++,argv--;
1800 scriptname = e_tmpname;
1801 }
1802@@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
1803 curcop->cop_line = 0;
1804 curstash = defstash;
1805 preprocess = FALSE;
1806- if (e_fp) {
1807- fclose(e_fp);
1808- e_fp = Nullfp;
1809+ if (e_tmpname) {
1810 (void)UNLINK(e_tmpname);
1811+ Safefree(e_tmpname);
1812+ e_tmpname = Nullch;
1813 }
1814
1815 /* now that script is parsed, we can modify record separator */
1816@@ -1369,7 +1371,7 @@ SV *sv;
1817 scriptname = xfound;
1818 }
1819
1820- origfilename = savepv(e_fp ? "-e" : scriptname);
1821+ origfilename = savepv(e_tmpname ? "-e" : scriptname);
1822 curcop->cop_filegv = gv_fetchfile(origfilename);
1823 if (strEQ(origfilename,"-"))
1824 scriptname = "";
1825
1826EOPATCH
1827 }
1828
1829 if ($major < 3 && $^O eq 'openbsd'
1830 && !extract_from_file('pp_sys.c', qr/BSD_GETPGRP/)) {
1831 # Part of commit c3293030fd1b7489
1832 apply_patch(<<'EOPATCH');
1833diff --git a/pp_sys.c b/pp_sys.c
1834index 4608a2a..f0c9d1d 100644
1835--- a/pp_sys.c
1836+++ b/pp_sys.c
1837@@ -2903,8 +2903,8 @@ PP(pp_getpgrp)
1838 pid = 0;
1839 else
1840 pid = SvIVx(POPs);
1841-#ifdef USE_BSDPGRP
1842- value = (I32)getpgrp(pid);
1843+#ifdef BSD_GETPGRP
1844+ value = (I32)BSD_GETPGRP(pid);
1845 #else
1846 if (pid != 0)
1847 DIE("POSIX getpgrp can't take an argument");
1848@@ -2933,8 +2933,8 @@ PP(pp_setpgrp)
1849 }
1850
1851 TAINT_PROPER("setpgrp");
1852-#ifdef USE_BSDPGRP
1853- SETi( setpgrp(pid, pgrp) >= 0 );
1854+#ifdef BSD_SETPGRP
1855+ SETi( BSD_SETPGRP(pid, pgrp) >= 0 );
1856 #else
1857 if ((pgrp != 0) || (pid != 0)) {
1858 DIE("POSIX setpgrp can't take an argument");
1859EOPATCH
1860 }
1861
1862 if ($major < 4 && $^O eq 'openbsd') {
1863 my $bad;
1864 # Need changes from commit a6e633defa583ad5.
1865 # Commits c07a80fdfe3926b5 and f82b3d4130164d5f changed the same part
1866 # of perl.h
1867
1868 if (extract_from_file('perl.h',
1869 qr/^#ifdef HAS_GETPGRP2$/)) {
1870 $bad = <<'EOBAD';
1871***************
1872*** 57,71 ****
1873 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
1874 #define TAINT_ENV() if (tainting) taint_env()
1875
1876! #ifdef HAS_GETPGRP2
1877! # ifndef HAS_GETPGRP
1878! # define HAS_GETPGRP
1879! # endif
1880! #endif
1881!
1882! #ifdef HAS_SETPGRP2
1883! # ifndef HAS_SETPGRP
1884! # define HAS_SETPGRP
1885! # endif
1886 #endif
1887
1888EOBAD
1889 } elsif (extract_from_file('perl.h',
1890 qr/Gack, you have one but not both of getpgrp2/)) {
1891 $bad = <<'EOBAD';
1892***************
1893*** 56,76 ****
1894 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
1895 #define TAINT_ENV() if (tainting) taint_env()
1896
1897! #if defined(HAS_GETPGRP2) && defined(HAS_SETPGRP2)
1898! # define getpgrp getpgrp2
1899! # define setpgrp setpgrp2
1900! # ifndef HAS_GETPGRP
1901! # define HAS_GETPGRP
1902! # endif
1903! # ifndef HAS_SETPGRP
1904! # define HAS_SETPGRP
1905! # endif
1906! # ifndef USE_BSDPGRP
1907! # define USE_BSDPGRP
1908! # endif
1909! #else
1910! # if defined(HAS_GETPGRP2) || defined(HAS_SETPGRP2)
1911! #include "Gack, you have one but not both of getpgrp2() and setpgrp2()."
1912! # endif
1913 #endif
1914
1915EOBAD
1916 } elsif (extract_from_file('perl.h',
1917 qr/^#ifdef USE_BSDPGRP$/)) {
1918 $bad = <<'EOBAD'
1919***************
1920*** 91,116 ****
1921 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
1922 #define TAINT_ENV() if (tainting) taint_env()
1923
1924! #ifdef USE_BSDPGRP
1925! # ifdef HAS_GETPGRP
1926! # define BSD_GETPGRP(pid) getpgrp((pid))
1927! # endif
1928! # ifdef HAS_SETPGRP
1929! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
1930! # endif
1931! #else
1932! # ifdef HAS_GETPGRP2
1933! # define BSD_GETPGRP(pid) getpgrp2((pid))
1934! # ifndef HAS_GETPGRP
1935! # define HAS_GETPGRP
1936! # endif
1937! # endif
1938! # ifdef HAS_SETPGRP2
1939! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
1940! # ifndef HAS_SETPGRP
1941! # define HAS_SETPGRP
1942! # endif
1943! # endif
1944 #endif
1945
1946 #ifndef _TYPES_ /* If types.h defines this it's easy. */
1947EOBAD
1948 }
1949 if ($bad) {
1950 apply_patch(<<"EOPATCH");
1951*** a/perl.h 2011-10-21 09:46:12.000000000 +0200
1952--- b/perl.h 2011-10-21 09:46:12.000000000 +0200
1953$bad--- 91,144 ----
1954 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
1955 #define TAINT_ENV() if (tainting) taint_env()
1956
1957! /* XXX All process group stuff is handled in pp_sys.c. Should these
1958! defines move there? If so, I could simplify this a lot. --AD 9/96.
1959! */
1960! /* Process group stuff changed from traditional BSD to POSIX.
1961! perlfunc.pod documents the traditional BSD-style syntax, so we'll
1962! try to preserve that, if possible.
1963! */
1964! #ifdef HAS_SETPGID
1965! # define BSD_SETPGRP(pid, pgrp) setpgid((pid), (pgrp))
1966! #else
1967! # if defined(HAS_SETPGRP) && defined(USE_BSD_SETPGRP)
1968! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
1969! # else
1970! # ifdef HAS_SETPGRP2 /* DG/UX */
1971! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
1972! # endif
1973! # endif
1974! #endif
1975! #if defined(BSD_SETPGRP) && !defined(HAS_SETPGRP)
1976! # define HAS_SETPGRP /* Well, effectively it does . . . */
1977! #endif
1978!
1979! /* getpgid isn't POSIX, but at least Solaris and Linux have it, and it makes
1980! our life easier :-) so we'll try it.
1981! */
1982! #ifdef HAS_GETPGID
1983! # define BSD_GETPGRP(pid) getpgid((pid))
1984! #else
1985! # if defined(HAS_GETPGRP) && defined(USE_BSD_GETPGRP)
1986! # define BSD_GETPGRP(pid) getpgrp((pid))
1987! # else
1988! # ifdef HAS_GETPGRP2 /* DG/UX */
1989! # define BSD_GETPGRP(pid) getpgrp2((pid))
1990! # endif
1991! # endif
1992! #endif
1993! #if defined(BSD_GETPGRP) && !defined(HAS_GETPGRP)
1994! # define HAS_GETPGRP /* Well, effectively it does . . . */
1995! #endif
1996!
1997! /* These are not exact synonyms, since setpgrp() and getpgrp() may
1998! have different behaviors, but perl.h used to define USE_BSDPGRP
1999! (prior to 5.003_05) so some extension might depend on it.
2000! */
2001! #if defined(USE_BSD_SETPGRP) || defined(USE_BSD_GETPGRP)
2002! # ifndef USE_BSDPGRP
2003! # define USE_BSDPGRP
2004! # endif
2005 #endif
2006
2007 #ifndef _TYPES_ /* If types.h defines this it's easy. */
2008EOPATCH
2009 }
2010 }
2011
2012 if ($major == 4 && extract_from_file('scope.c', qr/\(SV\*\)SSPOPINT/)) {
2013 # [PATCH] 5.004_04 +MAINT_TRIAL_1 broken when sizeof(int) != sizeof(void)
2014 # Fixes a bug introduced in 161b7d1635bc830b
2015 apply_commit('9002cb76ec83ef7f');
2016 }
2017
2018 if ($major == 4 && extract_from_file('av.c', qr/AvARRAY\(av\) = 0;/)) {
2019 # Fixes a bug introduced in 1393e20655efb4bc
2020 apply_commit('e1c148c28bf3335b', 'av.c');
2021 }
2022
2023 if ($major == 4 && !extract_from_file('perl.c', qr/delimcpy.*,$/)) {
2024 # bug introduced in 2a92aaa05aa1acbf, fixed in 8490252049bf42d3
2025 apply_patch(<<'EOPATCH');
2026diff --git a/perl.c b/perl.c
2027index 4eb69e3..54bbb00 100644
2028--- a/perl.c
2029+++ b/perl.c
2030@@ -1735,7 +1735,7 @@ SV *sv;
2031 if (len < sizeof tokenbuf)
2032 tokenbuf[len] = '\0';
2033 #else /* ! (atarist || DOSISH) */
2034- s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend
2035+ s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend,
2036 ':',
2037 &len);
2038 #endif /* ! (atarist || DOSISH) */
2039EOPATCH
2040 }
2041
2042 if ($major == 4 && $^O eq 'linux') {
2043 # Whilst this is fixed properly in f0784f6a4c3e45e1 which provides the
2044 # Configure probe, it's easier to back out the problematic changes made
2045 # in these previous commits:
2046 if (extract_from_file('doio.c',
2047 qr!^/\* XXX REALLY need metaconfig test \*/$!)) {
2048 revert_commit('4682965a1447ea44', 'doio.c');
2049 }
2050 if (my $token = extract_from_file('doio.c',
2051 qr!^#if (defined\(__sun(?:__)?\)) && defined\(__svr4__\) /\* XXX Need metaconfig test \*/$!)) {
2052 my $patch = `git show -R 9b599b2a63d2324d doio.c`;
2053 $patch =~ s/defined\(__sun__\)/$token/g;
2054 apply_patch($patch);
2055 }
2056 if (extract_from_file('doio.c',
2057 qr!^/\* linux \(and Solaris2\?\) uses :$!)) {
2058 revert_commit('8490252049bf42d3', 'doio.c');
2059 }
2060 if (extract_from_file('doio.c',
2061 qr/^ unsemds.buf = &semds;$/)) {
2062 revert_commit('8e591e46b4c6543e');
2063 }
2064 if (extract_from_file('doio.c',
2065 qr!^#ifdef __linux__ /\* XXX Need metaconfig test \*/$!)) {
2066 # Reverts part of commit 3e3baf6d63945cb6
2067 apply_patch(<<'EOPATCH');
2068diff --git b/doio.c a/doio.c
2069index 62b7de9..0d57425 100644
2070--- b/doio.c
2071+++ a/doio.c
2072@@ -1333,9 +1331,6 @@ SV **sp;
2073 char *a;
2074 I32 id, n, cmd, infosize, getinfo;
2075 I32 ret = -1;
2076-#ifdef __linux__ /* XXX Need metaconfig test */
2077- union semun unsemds;
2078-#endif
2079
2080 id = SvIVx(*++mark);
2081 n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0;
2082@@ -1364,29 +1359,11 @@ SV **sp;
2083 infosize = sizeof(struct semid_ds);
2084 else if (cmd == GETALL || cmd == SETALL)
2085 {
2086-#ifdef __linux__ /* XXX Need metaconfig test */
2087-/* linux uses :
2088- int semctl (int semid, int semnun, int cmd, union semun arg)
2089-
2090- union semun {
2091- int val;
2092- struct semid_ds *buf;
2093- ushort *array;
2094- };
2095-*/
2096- union semun semds;
2097- if (semctl(id, 0, IPC_STAT, semds) == -1)
2098-#else
2099 struct semid_ds semds;
2100 if (semctl(id, 0, IPC_STAT, &semds) == -1)
2101-#endif
2102 return -1;
2103 getinfo = (cmd == GETALL);
2104-#ifdef __linux__ /* XXX Need metaconfig test */
2105- infosize = semds.buf->sem_nsems * sizeof(short);
2106-#else
2107 infosize = semds.sem_nsems * sizeof(short);
2108-#endif
2109 /* "short" is technically wrong but much more portable
2110 than guessing about u_?short(_t)? */
2111 }
2112@@ -1429,12 +1406,7 @@ SV **sp;
2113 #endif
2114 #ifdef HAS_SEM
2115 case OP_SEMCTL:
2116-#ifdef __linux__ /* XXX Need metaconfig test */
2117- unsemds.buf = (struct semid_ds *)a;
2118- ret = semctl(id, n, cmd, unsemds);
2119-#else
2120 ret = semctl(id, n, cmd, (struct semid_ds *)a);
2121-#endif
2122 break;
2123 #endif
2124 #ifdef HAS_SHM
2125EOPATCH
2126 }
2127 # Incorrect prototype added as part of 8ac853655d9b7447, fixed as part
2128 # of commit dc45a647708b6c54, with at least one intermediate
2129 # modification. Correct prototype for gethostbyaddr has socklen_t
2130 # second. Linux has uint32_t first for getnetbyaddr.
2131 # Easiest just to remove, instead of attempting more complex patching.
2132 # Something similar may be needed on other platforms.
2133 edit_file('pp_sys.c', sub {
2134 my $code = shift;
2135 $code =~ s/^ struct hostent \*(?:PerlSock_)?gethostbyaddr\([^)]+\);$//m;
2136 $code =~ s/^ struct netent \*getnetbyaddr\([^)]+\);$//m;
2137 return $code;
2138 });
2139 }
2140
2141 if ($major < 6 && $^O eq 'netbsd'
2142 && !extract_from_file('unixish.h',
2143 qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) {
2144 apply_patch(<<'EOPATCH')
2145diff --git a/unixish.h b/unixish.h
2146index 2a6cbcd..eab2de1 100644
2147--- a/unixish.h
2148+++ b/unixish.h
2149@@ -89,7 +89,7 @@
2150 */
2151 /* #define ALTERNATE_SHEBANG "#!" / **/
2152
2153-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
2154+#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__)
2155 # include <signal.h>
2156 #endif
2157
2158EOPATCH
2159 }
2160
2161 if (($major >= 7 || $major <= 9) && $^O eq 'openbsd'
2162 && `uname -m` eq "sparc64\n"
2163 # added in 2000 by commit cb434fcc98ac25f5:
2164 && extract_from_file('regexec.c',
2165 qr!/\* No need to save/restore up to this paren \*/!)
2166 # re-indented in 2006 by commit 95b2444054382532:
2167 && extract_from_file('regexec.c', qr/^\t\tCURCUR cc;$/)) {
2168 # Need to work around a bug in (at least) OpenBSD's 4.6's sparc64 #
2169 # compiler ["gcc (GCC) 3.3.5 (propolice)"]. Between commits
2170 # 3ec562b0bffb8b8b (2002) and 1a4fad37125bac3e^ (2005) the darling thing
2171 # fails to compile any code for the statement cc.oldcc = PL_regcc;
2172 #
2173 # If you refactor the code to "fix" that, or force the issue using set
2174 # in the debugger, the stack smashing detection code fires on return
2175 # from S_regmatch(). Turns out that the compiler doesn't allocate any
2176 # (or at least enough) space for cc.
2177 #
2178 # Restore the "uninitialised" value for cc before function exit, and the
2179 # stack smashing code is placated. "Fix" 3ec562b0bffb8b8b (which
2180 # changes the size of auto variables used elsewhere in S_regmatch), and
2181 # the crash is visible back to bc517b45fdfb539b (which also changes
2182 # buffer sizes). "Unfix" 1a4fad37125bac3e and the crash is visible until
2183 # 5b47454deb66294b. Problem goes away if you compile with -O, or hack
2184 # the code as below.
2185 #
2186 # Hence this turns out to be a bug in (old) gcc. Not a security bug we
2187 # still need to fix.
2188 apply_patch(<<'EOPATCH');
2189diff --git a/regexec.c b/regexec.c
2190index 900b491..6251a0b 100644
2191--- a/regexec.c
2192+++ b/regexec.c
2193@@ -2958,7 +2958,11 @@ S_regmatch(pTHX_ regnode *prog)
2194 I,I
2195 *******************************************************************/
2196 case CURLYX: {
2197- CURCUR cc;
2198+ union {
2199+ CURCUR hack_cc;
2200+ char hack_buff[sizeof(CURCUR) + 1];
2201+ } hack;
2202+#define cc hack.hack_cc
2203 CHECKPOINT cp = PL_savestack_ix;
2204 /* No need to save/restore up to this paren */
2205 I32 parenfloor = scan->flags;
2206@@ -2983,6 +2987,7 @@ S_regmatch(pTHX_ regnode *prog)
2207 n = regmatch(PREVOPER(next)); /* start on the WHILEM */
2208 regcpblow(cp);
2209 PL_regcc = cc.oldcc;
2210+#undef cc
2211 saySAME(n);
2212 }
2213 /* NOT REACHED */
2214EOPATCH
2215}
2216
2217 if ($major < 8 && $^O eq 'openbsd'
2218 && !extract_from_file('perl.h', qr/include <unistd\.h>/)) {
2219 # This is part of commit 3f270f98f9305540, applied at a slightly
2220 # different location in perl.h, where the context is stable back to
2221 # 5.000
2222 apply_patch(<<'EOPATCH');
2223diff --git a/perl.h b/perl.h
2224index 9418b52..b8b1a7c 100644
2225--- a/perl.h
2226+++ b/perl.h
2227@@ -496,6 +496,10 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
2228 # include <sys/param.h>
2229 #endif
2230
2231+/* If this causes problems, set i_unistd=undef in the hint file. */
2232+#ifdef I_UNISTD
2233+# include <unistd.h>
2234+#endif
2235
2236 /* Use all the "standard" definitions? */
2237 #if defined(STANDARD_C) && defined(I_STDLIB)
2238EOPATCH
2239 }
2240}
2241
9a999a97
NC
2242# Local variables:
2243# cperl-indent-level: 4
2244# indent-tabs-mode: nil
2245# End:
2246#
2247# ex: set ts=8 sts=4 sw=4 et: