4 use Getopt::Long qw(:config bundling no_auto_abbrev);
7 use File::Temp qw(tempdir);
11 = qw(none config.sh config.h miniperl lib/Config.pm Fcntl perl test_prep);
16 clean => 1, # mostly for debugging this
19 # We accept #!./miniperl and #!./perl
20 # We don't accept #!miniperl and #!perl as their intent is ambiguous
21 my $run_with_our_perl = qr{\A#!(\./(?:mini)?perl)\b};
23 my $linux64 = `uname -sm` eq "Linux x86_64\n" ? '64' : '';
28 # This is the search logic for a multi-arch library layout
29 # added to linux.sh in commits 40f026236b9959b7 and dcffd848632af2c7.
30 my $gcc = -x '/usr/bin/gcc' ? '/usr/bin/gcc' : 'gcc';
32 foreach (`$gcc -print-search-dirs`) {
33 next unless /^libraries: =(.*)/;
34 foreach (split ':', $1) {
41 push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib)
50 (@paths ? (libpth => \@paths) : ()),
53 # Needed for the 'ignore_versioned_solibs' emulation below.
54 push @paths, qw(/usr/local/lib /lib /usr/lib)
57 unless(GetOptions(\%options,
58 'target=s', 'make=s', 'jobs|j=i', 'crash', 'expect-pass=i',
59 'expect-fail' => sub { $options{'expect-pass'} = 0; },
60 'clean!', 'one-liner|e=s@', 'c', 'l', 'w', 'match=s',
62 $options{match} = $_[1];
63 $options{'expect-pass'} = 0;
65 'force-manifest', 'force-regen', 'setpgrp!', 'timeout=i',
66 'test-build', 'validate',
67 'all-fixups', 'early-fixup=s@', 'late-fixup=s@', 'valgrind',
68 'check-args', 'check-shebang!', 'usage|help|?', 'gold=s',
69 'module=s', 'with-module=s', 'cpan-config-dir=s',
70 'test-module=s', 'no-module-tests',
73 my (undef, $val) = @_;
74 if ($val =~ /\A([^=]+)=(.*)/s) {
75 $defines{$1} = length $2 ? $2 : "\0";
81 $defines{$_[1]} = undef;
84 pod2usage(exitval => 255, verbose => 1);
87 my ($target, $match) = @options{qw(target match)};
89 @ARGV = ('sh', '-c', 'cd t && ./perl TEST base/*.t')
90 if $options{validate} && !@ARGV;
92 pod2usage(exitval => 0, verbose => 2) if $options{usage};
94 # This needs to be done before the next arguments check, as it's populating
96 if (defined $target && $target =~ /\.t\z/) {
97 # t/TEST don't have a reliable way to run the test script under valgrind
98 # The $ENV{VALGRIND} code was only added after v5.8.0, and is more
99 # geared to logging than to exiting on failure if errors are found.
100 # I guess one could fudge things by replacing the symlink t/perl with a
101 # wrapper script which invokes valgrind, but leave doing that until
102 # someone needs it. (If that's you, then patches welcome.)
103 foreach (qw(valgrind match validate test-build one-liner)) {
104 die_255("$0: Test-case targets can't be run with --$_")
107 die_255("$0: Test-case targets can't be combined with an explicit test")
110 # Needing this unless is a smell suggesting that this implementation of
111 # test-case targets is not really in the right place.
112 unless ($options{'check-args'}) {
113 # The top level sanity tests refuse to start or end a test run at a
114 # revision which skips, hence this test ensures reasonable sanity at
115 # automatically picking a suitable start point for both normal operation
117 skip("Test case $target is not a readable file")
118 unless -f $target && -r _;
121 # t/TEST runs from and takes pathnames relative to t/, so need to strip
122 # out a leading t, or add ../ otherwise
123 unless ($target =~ s!\At/!!) {
124 $target = "../$target";
126 @ARGV = ('sh', '-c', "cd t && ./perl TEST " . quotemeta $target);
127 $target = 'test_prep';
130 pod2usage(exitval => 255, verbose => 1)
131 unless @ARGV || $match || $options{'test-build'}
132 || defined $options{'one-liner'} || defined $options{module}
133 || defined $options{'test-module'};
134 pod2usage(exitval => 255, verbose => 1)
135 if !$options{'one-liner'} && ($options{l} || $options{w});
136 if ($options{'no-module-tests'} && $options{module}) {
137 print STDERR "--module and --no-module-tests are exclusive.\n\n";
138 pod2usage(exitval => 255, verbose => 1)
140 if ($options{'no-module-tests'} && $options{'test-module'}) {
141 print STDERR "--test-module and --no-module-tests are exclusive.\n\n";
142 pod2usage(exitval => 255, verbose => 1)
144 if ($options{module} && $options{'test-module'}) {
145 print STDERR "--module and --test-module are exclusive.\n\n";
146 pod2usage(exitval => 255, verbose => 1)
149 check_shebang($ARGV[0])
150 if $options{'check-shebang'} && @ARGV && !$options{match};
152 exit 0 if $options{'check-args'};
156 bisect.pl - use git bisect to pinpoint changes
160 # When did this become an error?
161 .../Porting/bisect.pl -e 'my $a := 2;'
162 # When did this stop being an error?
163 .../Porting/bisect.pl --expect-fail -e '1 // 2'
164 # When did this test start failing?
165 .../Porting/bisect.pl --target t/op/sort.t
166 # When were all lines matching this pattern removed from all files?
167 .../Porting/bisect.pl --match '\b(?:PL_)hash_seed_set\b'
168 # When was some line matching this pattern added to some file?
169 .../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
170 # When did this test program stop exiting 0?
171 .../Porting/bisect.pl -- ./perl -Ilib ../test_prog.pl
172 # When did this test program start crashing (any signal or coredump)?
173 .../Porting/bisect.pl --crash -- ./perl -Ilib ../test_prog.pl
174 # When did this first become valid syntax?
175 .../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
176 --expect-fail -e 'my $a := 2;'
177 # What was the last revision to build with these options?
178 .../Porting/bisect.pl --test-build -Dd_dosuid
179 # When did this test program start generating errors from valgrind?
180 .../Porting/bisect.pl --valgrind ../test_prog.pl
181 # When did these cpan modules start failing to compile/pass tests?
182 .../Porting/bisect.pl --module=autobox,Moose
183 # When did this code stop working in blead with these modules?
184 .../Porting/bisect.pl --with-module=Moose,Moo -e 'use Moose; 1;'
185 # Like the above 2 but with custom CPAN::MyConfig
186 .../Porting/bisect.pl --module=Moo --cpan-config-dir=/home/blah/custom/
190 Together F<bisect.pl> and F<bisect-runner.pl> attempt to automate the use
191 of C<git bisect> as much as possible. With one command (and no other files)
192 it's easy to find out
198 Which commit caused this example code to break?
202 Which commit caused this example code to start working?
206 Which commit added the first file to match this regex?
210 Which commit removed the last file to match this regex?
214 usually without needing to know which versions of perl to use as start and
217 By default F<bisect.pl> will process all options, then use the rest of the
218 command line as arguments to list C<system> to run a test case. By default,
219 the test case should pass (exit with 0) on earlier perls, and fail (exit
220 non-zero) on I<blead>. F<bisect.pl> will use F<bisect-runner.pl> to find the
221 earliest stable perl version on which the test case passes, check that it
222 fails on blead, and then use F<bisect-runner.pl> with C<git bisect run> to
223 find the commit which caused the failure.
225 Many of perl's own test scripts exit 0 even if their TAP reports test
226 failures, and some need particular setup (such as running from the right
227 directory, or adding C<-T> to the command line). Hence if you want to bisect
228 a test script, you can specify it with the I<--target> option, and it will
229 be invoked using F<t/TEST> which performs all the setup, and exits non-zero
230 if the TAP reports failures. This works for any file ending C<.t>, so you can
231 use it with a file outside of the working checkout, for example to test a
232 particular version of a test script, as a path inside the repository will
233 (of course) be testing the version of the script checked out for the current
234 revision, which may be too early to have the test you are interested in.
236 Because the test case is the complete argument to C<system>, it is easy to
237 run something other than the F<perl> built, if necessary. If you need to run
238 the perl built, you'll probably need to invoke it as C<./perl -Ilib ...>.
239 As a special case, if the first argument of the test case is a readable file
240 (whether executable or not), matching C<qr{\A#!./(?:mini)?perl\b}> then it
241 will have C<./perl> <-Ilib> (or C<./miniperl>) prepended to it.
243 You need a clean checkout to run a bisect. You can use the checkout
244 containing F<Porting/bisect.pl> if you wish - in this case
245 F<Porting/bisect.pl> will copy F<Porting/bisect-runner.pl> to a temporary
246 file generated by C<File::Temp::tempfile()>. If doing this, beware that when
247 the bisect ends (or you abort it) then your checkout is no longer at
248 C<blead>, so you will need to C<git checkout blead> before restarting, to
249 get the current version of F<Porting/bisect.pl> again. It's often easier
250 either to copy F<Porting/bisect.pl> and F<Porting/bisect-runner.pl> to
251 another directory (I<e.g.> F<~/bin>, if you have one), or to create a second
252 git repository for running bisect. To create a second local repository, if
253 your working checkout is called F<perl>, a simple solution is to make a
254 local clone, and run from that. I<i.e.>:
259 ../perl/Porting/bisect.pl ...
261 By default, F<bisect-runner.pl> will automatically disable the build of
262 L<DB_File> for commits earlier than ccb44e3bf3be2c30, as it's not practical
263 to patch DB_File 1.70 and earlier to build with current Berkeley DB headers.
264 (ccb44e3bf3be2c30 was in September 1999, between 5.005_62 and 5.005_63.)
265 If your F<db.h> is old enough you can override this with C<-Unoextensions>.
273 --start I<commit-ish>
275 Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
276 else C<git> understands as a revision). If not specified, F<bisect.pl> will
277 search stable .0 perl releases until it finds one where the test case
278 passes. The default is to search from 5.002 to the most recent tagged stable
279 release (v5.18.0 at the time of writing). If F<bisect.pl> detects that the
280 checkout is on a case insensitive file system, it will search from 5.005 to
281 the most recent tagged stable release. Only .0 stable releases are used
282 because these are the only stable releases that are parents of blead, and
283 hence suitable for a bisect run.
289 Most recent revision to test, as a I<commit-ish>. If not specified, defaults
296 F<Makefile> target (or equivalent) needed, to run the test case. If specified,
297 this should be one of
305 Don't build anything - just run the user test case against a clean checkout.
306 Using this gives a couple of features that a plain C<git bisect run> can't
307 offer - automatic start revision detection, and test case C<--timeout>.
313 Just run F<./Configure>
319 Run the various F<*.SH> files to generate F<Makefile>, F<config.h>, I<etc>.
331 Use F<miniperl> to build F<lib/Config.pm>
337 Build F<lib/auto/Fcntl/Fnctl.so> (strictly, C<.$Config{so}>). As L<Fcntl>
338 is simple XS module present since 5.000, this provides a fast test of
339 whether XS modules can be built. Note, XS modules are built by F<miniperl>,
340 hence this target will not build F<perl>.
346 Build F<perl>. This also builds pure-Perl modules in F<cpan>, F<dist> and
347 F<ext>. XS modules (such as L<Fcntl>) are not built.
353 Build everything needed to run the tests. This is the default if we're
354 running test code, but is time consuming, as it means building all
355 XS modules. For older F<Makefile>s, the previous name of C<test-prep>
356 is automatically substituted. For very old F<Makefile>s, C<make test> is
357 run, as there is no target provided to just get things ready, and for 5.004
358 and earlier the tests run very quickly.
364 Build everything needed to run the tests, and then run this test script using
365 F<t/TEST>. This is actually implemented internally by using the target
366 I<test_prep>, and setting the test case to "sh", "-c", "cd t && ./TEST ..."
372 --one-liner 'code to run'
378 Example code to run, just like you'd use with C<perl -e>.
380 This prepends C<./perl -Ilib -e 'code to run'> to the test case given,
381 or F<./miniperl> if I<target> is C<miniperl>.
383 (Usually you'll use C<-e> instead of providing a test case in the
384 non-option arguments to F<bisect.pl>. You can repeat C<-e> on the command
385 line, just like you can with C<perl>)
387 C<-E> intentionally isn't supported, as it's an error in 5.8.0 and earlier,
388 which interferes with detecting errors in the example code itself.
394 Add C<-c> to the command line, to cause perl to exit after syntax checking.
400 Add C<-l> to the command line with C<-e>
402 This will automatically append a newline to every output line of your testcase.
403 Note that you can't specify an argument to F<perl>'s C<-l> with this, as it's
404 not feasible to emulate F<perl>'s somewhat quirky switch parsing with
405 L<Getopt::Long>. If you need the full flexibility of C<-l>, you need to write
406 a full test case, instead of using C<bisect.pl>'s C<-e> shortcut.
412 Add C<-w> to the command line with C<-e>
414 It's not valid to pass C<-c>, C<-l> or C<-w> to C<bisect.pl> unless you are
421 The test case should fail for the I<start> revision, and pass for the I<end>
422 revision. The bisect run will find the first commit where it passes.
428 Treat any non-crash as success, any crash as failure. (Crashing defined
429 as exiting with a signal or a core dump.)
433 -D I<config_arg=value>
441 -A I<config_arg=value>
443 Arguments (C<-A>, C<-D>, C<-U>) to pass to F<Configure>. For example,
445 -Dnoextensions=Encode
447 -Accflags=-DNO_MATHOMS
449 Repeated C<-A> arguments are passed
450 through as is. C<-D> and C<-U> are processed in order, and override
451 previous settings for the same parameter. F<bisect-runner.pl> emulates
452 C<-Dnoextensions> when F<Configure> itself does not provide it, as it's
453 often very useful to be able to disable some XS extensions.
459 The C<make> command to use. If this not set, F<make> is used. If this is
460 set, it also adds a C<-Dmake=...> else some recursive make invocations
461 in extensions may fail. Typically one would use this as C<--make gmake>
462 to use F<gmake> in place of the system F<make>.
472 Number of C<make> jobs to run in parallel. A value of 0 suppresses
473 parallelism. If F</proc/cpuinfo> exists and can be parsed, or F</sbin/sysctl>
474 exists and reports C<hw.ncpu>, or F</usr/bin/getconf> exists and reports
475 C<_NPROCESSORS_ONLN> defaults to 1 + I<number of CPUs>. On HP-UX with the
476 system make defaults to 0, otherwise defaults to 2.
486 Instead of running a test program to determine I<pass> or I<fail>,
487 C<--match> will pass if the given regex matches, and hence search for the
488 commit that removes the last matching file. C<--no-match> inverts the test,
489 to search for the first commit that adds files that match.
491 The remaining command line arguments are treated as glob patterns for files
492 to match against. If none are specified, then they default as follows:
498 If no I<target> is specified, the match is against all files in the
499 repository (which is fast).
503 If a I<target> is specified, that target is built, and the match is against
504 only the built files.
508 Treating the command line arguments as glob patterns should not cause
509 problems, as the perl distribution has never shipped or built files with
510 names that contain characters which are globbing metacharacters.
512 Anything which is not a readable file is ignored, instead of generating an
513 error. (If you want an error, run C<grep> or C<ack> as a test case). This
514 permits one to easily search in a file that changed its name. For example:
516 .../Porting/bisect.pl --match 'Pod.*Functions' 'pod/buildtoc*'
518 C<--no-match ...> is implemented as C<--expect-fail --match ...>
524 Run the test program under C<valgrind>. If you need to test for memory
525 errors when parsing invalid programs, the default parser fail exit code of
526 255 will always override C<valgrind>, so try putting the test case invalid
527 code inside a I<string> C<eval>, so that the perl interpreter will exit with 0.
528 (Be sure to check the output of $@, to avoid missing mistakes such as
529 unintended C<eval> failures due to incorrect C<@INC>)
531 Specifically, this option prepends C<valgrind> C<--error-exitcode=124> to
532 the command line that runs the testcase, to cause valgrind to exit non-zero
533 if it detects errors, with the assumption that the test program itself
534 always exits with zero. If you require more flexibility than this, either
535 specify your C<valgrind> invocation explicitly as part of the test case, or
536 use a wrapper script to control the command line or massage the exit codes.
542 Test that the build completes, without running any test case.
544 By default, if the build for the desired I<target> fails to complete,
545 F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
546 being that one wants to find a commit which changed state "builds && passes"
547 to "builds && fails". If instead one is interested in which commit broke the
548 build (possibly for particular F<Configure> options), use I<--test-build>
549 to treat a build failure as a failure, not a "skip".
551 Often this option isn't as useful as it first seems, because I<any> build
552 failure will be reported to C<git bisect> as a failure, not just the failure
553 that you're interested in. Generally, to debug a particular problem, it's
554 more useful to use a I<target> that builds properly at the point of interest,
555 and then a test case that runs C<make>. For example:
557 .../Porting/bisect.pl --start=perl-5.000 --end=perl-5.002 \
558 --expect-fail --force-manifest --target=miniperl make perl
560 will find the first revision capable of building L<DynaLoader> and then
561 F<perl>, without becoming confused by revisions where F<miniperl> won't
566 --module module1,module2,...
568 Install this (or these) module(s), die when it (the last of those)
569 cannot be updated to the current version.
571 Misnomer. the argument can be any argument that can be passed to CPAN
572 shell's install command. B<But>: since we only have the uptodate
573 command to verify that an install has taken place, we are unable to
574 determine success for arguments like
575 MSCHWERN/Test-Simple-1.005000_005.tar.gz.
577 In so far, it is not such a misnomer.
579 Note that this and I<--with-module> will both require a C<CPAN::MyConfig>.
580 If F<$ENV{HOME}/.cpan/CPAN/MyConfig.pm> does not exist, a CPAN shell will
581 be started up for you so you can configure one. Feel free to let
582 CPAN pick defaults for you. Enter 'quit' when you are done, and
583 then everything should be all set. Alternatively, you may
584 specify a custom C<CPAN::MyConfig> by using I<--cpan-config-dir>.
586 Also, if you want to bisect a module that needs a display (like
587 TK) and you don't want random screens appearing and disappearing
588 on your computer while you're working, you can do something like
593 $ while true; do date ; if ! ps auxww | grep -v grep \
594 | grep -q Xvfb; then Xvfb :121 & fi; echo -n 'sleeping 60 '; \
599 DISPLAY=":121" .../Porting/bisect.pl --module=TK
601 (Some display alternatives are vncserver and Xnest.)
605 --with-module module1,module2,...
607 Like I<--module> above, except this simply installs the requested
608 modules and they can then be used in other tests.
612 .../Porting/bisect.pl --with-module=Moose -e 'use Moose; ...'
618 Use in conjunction with I<--with-module> to install the modules without
619 running their tests. This can be a big time saver.
623 .../Porting/bisect.pl --with-module=Moose --no-module-tests \
630 This is like I<--module>, but just runs the module's tests, instead of
633 WARNING: This is a somewhat experimental option, known to work on recent
634 CPAN shell versions. If you use this option and strange things happen,
637 Usually, you can just use I<--module>, but if you are getting inconsistent
638 installation failures and you just want to see when the tests started
639 failing, you might find this option useful.
643 --cpan-config-dir /home/blah/custom
645 If defined, this will cause L<CPAN> to look for F<CPAN/MyConfig.pm> inside of
646 the specified directory, instead of using the default config of
647 F<$ENV{HOME}/.cpan/>.
649 If no default config exists, a L<CPAN> shell will be fired up for you to
650 configure things. Letting L<CPAN> automatically configure things for you
651 should work well enough. You probably want to choose I<manual> instead of
652 I<local::lib> if it asks. When you're finished with configuration, just
653 type I<q> and hit I<ENTER> and the bisect should continue.
659 By default, a build will "skip" if any files listed in F<MANIFEST> are not
660 present. Usually this is useful, as it avoids false-failures. However, there
661 are some long ranges of commits where listed files are missing, which can
662 cause a bisect to abort because all that remain are skipped revisions.
664 In these cases, particularly if the test case uses F<miniperl> and no modules,
665 it may be more useful to force the build to continue, even if files
666 F<MANIFEST> are missing.
672 Run C<make regen_headers> before building F<miniperl>. This may fix a build
673 that otherwise would skip because the generated headers at that revision
674 are stale. It's not the default because it conceals this error in the true
675 state of such revisions.
681 C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
687 Run the testcase with the given timeout. If this is exceeded, kill it (and
688 by default all its children), and treat it as a failure.
694 Run the testcase in its own process group. Specifically, call C<setpgrp 0, 0>
695 just before C<exec>-ing the user testcase. The default is not to set the
696 process group, unless a timeout is used.
702 F<bisect-runner.pl> will minimally patch various files on a platform and
703 version dependent basis to get the build to complete. Normally it defers
704 doing this as long as possible - C<.SH> files aren't patched until after
705 F<Configure> is run, and C<C> and C<XS> code isn't patched until after
706 F<miniperl> is built. If C<--all-fixups> is specified, all the fixups are
707 done before running C<Configure>. In rare cases adding this may cause a
708 bisect to abort, because an inapplicable patch or other fixup is attempted
709 for a revision which would usually have already I<skip>ped. If this happens,
710 please report it as a bug, giving the OS and problem revision.
720 Specify a file containing a patch or other fixup for the source code. The
721 action to take depends on the first line of the fixup file
729 If the first line starts C<#!perl> then the file is run using C<$^X>
735 If a shebang line is present the file is executed using C<system>
739 C<I<filename> =~ /I<pattern>/>
743 C<I<filename> !~ /I<pattern>/>
745 If I<filename> does not exist then the fixup file's contents are ignored.
746 Otherwise, for C<=~>, if it contains a line matching I<pattern>, then the
747 file is fed to C<patch -p1> on standard input. For C<=~>, the patch is
748 applied if no lines match the pattern.
750 As the empty pattern in Perl is a special case (it matches the most recent
751 successful match) which is not useful here, the treatment of an empty pattern
752 is special-cased. C<I<filename> =~ //> applies the patch if filename is
753 present. C<I<filename> !~ //> applies the patch if filename missing. This
754 makes it easy to unconditionally apply patches to files, and to use a patch
755 as a way of creating a new file.
759 Otherwise, the file is assumed to be a patch, and always applied.
763 I<early-fixup>s are applied before F<./Configure> is run. I<late-fixup>s are
764 applied just after F<./Configure> is run.
766 These options can be specified more than once. I<file> is actually expanded
767 as a glob pattern. Globs that do not match are errors, as are missing files.
773 Tell F<bisect-runner.pl> not to clean up after the build. This allows one
774 to use F<bisect-runner.pl> to build the current particular perl revision for
775 interactive testing, or for debugging F<bisect-runner.pl>.
777 Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
783 Test that all stable (.0) revisions can be built. By default, attempts to
784 build I<blead>, then tagged stable releases in reverse order down to
785 I<perl-5.002> (or I<perl5.005> on a case insensitive file system). Stops at
786 the first failure, without cleaning the checkout. Use I<--start> to specify
787 the earliest revision to test, I<--end> to specify the most recent. Useful
788 for validating a new OS/CPU/compiler combination. For example
790 ../perl/Porting/bisect.pl --validate -le 'print "Hello from $]"'
792 If no testcase is specified, the default is to use F<t/TEST> to run
799 Validate the options and arguments, and exit silently if they are valid.
805 Validate that the test case isn't an executable file with a
806 C<#!/usr/bin/perl> line (or similar). As F<bisect-runner.pl> does B<not>
807 automatically prepend C<./perl> to the test case, a I<#!> line specifying an
808 external F<perl> binary will cause the test case to always run with I<that>
809 F<perl>, not the F<perl> built by the bisect runner. Likely this is not what
810 you wanted. If your test case is actually a wrapper script to run other
811 commands, you should run it with an explicit interpreter, to be clear. For
812 example, instead of C<../perl/Porting/bisect.pl ~/test/testcase.pl> you'd
813 run C<../perl/Porting/bisect.pl /usr/bin/perl ~/test/testcase.pl>
819 Revision to use when checking out known-good recent versions of files,
820 such as F<makedepend.SH>. F<bisect-runner.pl> defaults this to I<blead>,
821 but F<bisect.pl> will default it to the most recent stable release.
835 Display the usage information and exit.
841 # Ensure we always exit with 255, to cause git bisect to abort.
843 my $message = join '', @_;
844 if ($message =~ /\n\z/) {
845 print STDERR $message;
847 my (undef, $file, $line) = caller 1;
848 print STDERR "@_ at $file line $line\n";
857 die_255("$0: Can't build $target")
858 if defined $target && !grep {@targets} $target;
860 foreach my $phase (qw(early late)) {
861 next unless $options{"$phase-fixup"};
865 foreach my $glob (@{$options{"$phase-fixup"}}) {
866 my @got = File::Glob::bsd_glob($glob);
867 push @expanded, @got ? @got : $glob;
869 @expanded = sort @expanded;
870 $options{"$phase-fixup"} = \@expanded;
871 foreach (@expanded) {
873 print STDERR "$phase-fixup '$_' is not a readable file\n";
877 exit 255 if $bail_out;
880 unless (exists $defines{cc}) {
881 # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
883 # FIXME - really it should be replaced with a proper test of
884 # "can we build something?" and a helpful diagnostic if we can't.
885 # For now, simply move it here.
886 $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
889 my $j = $options{jobs} ? "-j$options{jobs}" : '';
891 if (exists $options{make}) {
892 if (!exists $defines{make}) {
893 $defines{make} = $options{make};
896 $options{make} = 'make';
899 # Sadly, however hard we try, I don't think that it will be possible to build
900 # modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
901 # which updated to MakeMaker 3.7, which changed from using a hard coded ld
902 # in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
906 my $mode = @_ ? shift : '<';
907 open my $fh, $mode, $file or croak_255("Can't open $file: $!");
908 ${*$fh{SCALAR}} = $file;
915 croak_255("Can't close: $!") unless ref $fh eq 'GLOB';
916 croak_255("Can't close ${*$fh{SCALAR}}: $!");
920 my $command = '</dev/null ' . shift;
921 system($command) and croak_255("'$command' failed, \$!=$!, \$?=$?");
924 sub run_with_options {
926 my $name = $options->{name};
927 $name = "@_" unless defined $name;
929 my $setgrp = $options->{setpgrp};
930 if ($options->{timeout}) {
931 # Unless you explicitly disabled it on the commandline, set it:
932 $setgrp = 1 unless defined $setgrp;
935 die_255("Can't fork: $!") unless defined $pid;
937 if (exists $options->{stdin}) {
938 open STDIN, '<', $options->{stdin}
939 or die "Can't open STDIN from $options->{stdin}: $!";
943 or die "Can't setpgrp 0, 0: $!";
946 die_255("Failed to start $name: $!");
949 if ($options->{timeout}) {
952 die_255("No POSIX::WNOHANG")
953 unless &POSIX::WNOHANG;
956 my $victim = $setgrp ? -$pid : $pid;
958 kill 'TERM', $victim;
959 waitpid(-1, &POSIX::WNOHANG);
960 while (kill 0, $victim) {
962 waitpid(-1, &POSIX::WNOHANG);
965 if (kill 'KILL', $victim) {
966 print STDERR "$0: Had to kill 'KILL', $victim\n"
967 } elsif (! $!{ESRCH}) {
968 print STDERR "$0: kill 'KILL', $victim failed: $!\n";
973 report_and_exit(0, 'No timeout', 'Timeout', "when running $name");
975 alarm $options->{timeout};
978 or die_255("wait for $name, pid $pid failed: $!");
980 if ($options->{timeout}) {
981 my $elapsed = time - $start;
982 if ($elapsed / $options->{timeout} > 0.8) {
983 print STDERR "$0: Beware, took $elapsed seconds of $options->{timeout} permitted to run $name\n";
989 sub extract_from_file {
990 my ($file, $rx, $default) = @_;
991 my $fh = open_or_die($file);
994 return wantarray ? @got : $got[0]
997 return $default if defined $default;
1002 my ($file, $munger) = @_;
1004 my $fh = open_or_die($file);
1006 die_255("Can't read $file: $!") unless defined $orig && close $fh;
1007 my $new = $munger->($orig);
1008 return if $new eq $orig;
1009 $fh = open_or_die($file, '>');
1010 print $fh $new or die_255("Can't print to $file: $!");
1014 # AIX supplies a pre-historic patch program, which certainly predates Linux
1015 # and is probably older than NT. It can't cope with unified diffs. Meanwhile,
1016 # it's hard enough to get git diff to output context diffs, let alone git show,
1017 # and nearly all the patches embedded here are unified. So it seems that the
1018 # path of least resistance is to convert unified diffs to context diffs:
1021 my ($from_out, $to_out, $has_from, $has_to, $delete, $add) = @_;
1022 ++$$has_from if $delete;
1025 if ($delete && $add) {
1026 $$from_out .= "! $_\n" foreach @$delete;
1027 $$to_out .= "! $_\n" foreach @$add;
1029 $$from_out .= "- $_\n" foreach @$delete;
1031 $$to_out .= "+ $_\n" foreach @$add;
1035 # This isn't quite general purpose, as it can't cope with
1036 # '\ No newline at end of file'
1038 my $diff_in = shift;
1041 # Stuff before the diff
1042 while ($diff_in =~ s/\A(?!\*\*\* )(?!--- )([^\n]*\n?)//ms && length $1) {
1046 if (!length $diff_in) {
1047 die_255("That didn't seem to be a diff");
1050 if ($diff_in =~ /\A\*\*\* /ms) {
1051 warn "Seems to be a context diff already\n";
1052 return $diff_out . $diff_in;
1057 if ($diff_in =~ s/\A((?:diff |index )[^\n]+\n)//ms) {
1061 if ($diff_in !~ /\A--- /ms) {
1062 # Stuff after the diff;
1063 return $diff_out . $diff_in;
1065 $diff_in =~ s/\A([^\n]+\n?)//ms;
1067 die_255("Can't parse '$line'") unless $line =~ s/\A--- /*** /ms;
1069 $diff_in =~ s/\A([^\n]+\n?)//ms;
1071 die_255("Can't parse '$line'") unless $line =~ s/\A\+\+\+ /--- /ms;
1077 unless $diff_in =~ s/\A\@\@ (-([0-9]+),([0-9]+) \+([0-9]+),([0-9]+)) \@\@[^\n]*\n?//;
1078 my ($hunk, $from_start, $from_count, $to_start, $to_count)
1079 = ($1, $2, $3, $4, $5);
1080 my $from_end = $from_start + $from_count - 1;
1081 my $to_end = $to_start + $to_count - 1;
1082 my ($from_out, $to_out, $has_from, $has_to, $add, $delete);
1083 while (length $diff_in && ($from_count || $to_count)) {
1084 die_255("Confused in $hunk")
1085 unless $diff_in =~ s/\A([^\n]*)\n//ms;
1087 $line = ' ' unless length $line;
1088 if ($line =~ /^ .*/) {
1089 process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
1093 $from_out .= " $line\n";
1094 $to_out .= " $line\n";
1097 } elsif ($line =~ /^-(.*)/) {
1100 } elsif ($line =~ /^\+(.*)/) {
1104 die_255("Can't parse '$line' as part of hunk $hunk");
1107 process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
1109 die_255("No lines in hunk $hunk")
1110 unless length $from_out || length $to_out;
1111 die_255("No changes in hunk $hunk")
1112 unless $has_from || $has_to;
1113 $diff_out .= "***************\n";
1114 $diff_out .= "*** $from_start,$from_end ****\n";
1115 $diff_out .= $from_out if $has_from;
1116 $diff_out .= "--- $to_start,$to_end ----\n";
1117 $diff_out .= $to_out if $has_to;
1125 sub placate_patch_prog {
1128 if (!defined $use_context) {
1129 my $version = `patch -v 2>&1`;
1130 die_255("Can't run `patch -v`, \$?=$?, bailing out")
1131 unless defined $version;
1132 if ($version =~ /Free Software Foundation/) {
1134 } elsif ($version =~ /Header: patch\.c,v.*\blwall\b/) {
1135 # The system patch is older than Linux, and probably older than
1138 } elsif ($version =~ /Header: patch\.c,v.*\babhinav\b/) {
1139 # Thank you HP. No, we have no idea *which* version this is:
1140 # $Header: patch.c,v 76.1.1.2.1.3 2001/12/03 12:24:52 abhinav Exp $
1148 return $use_context ? ud2cd($patch) : $patch;
1153 my ($patch, $what, $files) = @_;
1154 $what = 'patch' unless defined $what;
1155 unless (defined $files) {
1156 $patch =~ m!^--- [ab]/(\S+)\n\+\+\+ [ba]/\1!sm;
1159 my $patch_to_use = placate_patch_prog($patch);
1160 open my $fh, '|-', 'patch', '-p1' or die_255("Can't run patch: $!");
1161 print $fh $patch_to_use;
1162 return if close $fh;
1163 print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
1164 print STDERR "\nConverted to a context diff <<'EOCONTEXT'\n${patch_to_use}EOCONTEXT\n"
1165 if $patch_to_use ne $patch;
1166 die_255("Can't $what$files: $?, $!");
1170 my ($commit, @files) = @_;
1171 my $patch = `git show $commit @files`;
1172 if (!defined $patch) {
1173 die_255("Can't get commit $commit for @files: $?") if @files;
1174 die_255("Can't get commit $commit: $?");
1176 apply_patch($patch, "patch $commit", @files ? " for @files" : '');
1180 my ($commit, @files) = @_;
1181 my $patch = `git show -R $commit @files`;
1182 if (!defined $patch) {
1183 die_255("Can't get revert commit $commit for @files: $?") if @files;
1184 die_255("Can't get revert commit $commit: $?");
1186 apply_patch($patch, "revert $commit", @files ? " for @files" : '');
1190 my ($file, $commit) = @_;
1191 $commit ||= $options{gold} || 'blead';
1192 system "git show $commit:$file > $file </dev/null"
1193 and die_255("Could not extract $file at revision $commit");
1198 return unless -e $file;
1199 my $fh = open_or_die($file);
1201 return if $line =~ $run_with_our_perl;
1203 die_255("$file is not executable.
1204 system($file, ...) is always going to fail.
1208 return unless $line =~ m{\A#!(/\S+/perl\S*)\s};
1209 die_255("$file will always be run by $1
1210 It won't be tested by the ./perl we build.
1211 If you intended to run it with that perl binary, please change your
1216 If you intended to test it with the ./perl we build, please change your
1221 [You may also need to add -- before ./perl to prevent that -Ilib as being
1222 parsed as an argument to bisect.pl]
1228 if ($options{clean}) {
1229 # Needed, because files that are build products in this checked out
1230 # version might be in git in the next desired version.
1231 system 'git clean -qdxf </dev/null';
1232 # Needed, because at some revisions the build alters checked out files.
1233 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
1234 system 'git reset --hard HEAD </dev/null';
1241 warn "skipping - $reason";
1245 sub report_and_exit {
1246 my ($good, $pass, $fail, $desc) = @_;
1250 my $got = ($options{'expect-pass'} ? $good : !$good) ? 'good' : 'bad';
1252 print "$got - $pass $desc\n";
1254 print "$got - $fail $desc\n";
1257 exit($got eq 'bad');
1260 sub run_report_and_exit {
1261 my $ret = run_with_options({setprgp => $options{setpgrp},
1262 timeout => $options{timeout},
1264 $ret &= 0xff if $options{crash};
1265 report_and_exit(!$ret, 'zero exit from', 'non-zero exit from', "@_");
1268 sub match_and_exit {
1269 my ($target, @globs) = @_;
1271 my $re = qr/$match/;
1276 foreach (sort map { File::Glob::bsd_glob($_)} @globs) {
1277 if (!-f $_ || !-r _) {
1278 warn "Skipping matching '$_' as it is not a readable file\n";
1285 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
1289 foreach my $file (@files) {
1290 my $fh = open_or_die($file);
1294 if (/[^[:^cntrl:]\h\v]/) { # Matches non-spacing non-C1 controls
1295 print "Binary file $file matches\n";
1297 $_ .= "\n" unless /\n\z/;
1304 report_and_exit($matches,
1305 $matches == 1 ? '1 match for' : "$matches matches for",
1306 'no matches for', $match);
1309 # Not going to assume that system perl is yet new enough to have autodie
1310 system_or_die('git clean -dxf');
1312 if (!defined $target) {
1313 match_and_exit(undef, @ARGV) if $match;
1314 $target = 'test_prep';
1315 } elsif ($target eq 'none') {
1316 match_and_exit(undef, @ARGV) if $match;
1317 run_report_and_exit(@ARGV);
1320 skip('no Configure - is this the //depot/perlext/Compiler branch?')
1321 unless -f 'Configure';
1323 my $case_insensitive;
1325 my ($dev_C, $ino_C) = stat 'Configure';
1326 die_255("Could not stat Configure: $!") unless defined $dev_C;
1327 my ($dev_c, $ino_c) = stat 'configure';
1329 if defined $dev_c && $dev_C == $dev_c && $ino_C == $ino_c;
1332 # This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
1334 = extract_from_file('patchlevel.h',
1335 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
1338 my $unfixable_db_file;
1341 && !extract_from_file('ext/DB_File/DB_File.xs',
1342 qr!^#else /\* Berkeley DB Version > 2 \*/$!)) {
1343 # This DB_File.xs is really too old to patch up.
1344 # Skip DB_File, unless we're invoked with an explicit -Unoextensions
1345 if (!exists $defines{noextensions}) {
1346 $defines{noextensions} = 'DB_File';
1347 } elsif (defined $defines{noextensions}) {
1348 $defines{noextensions} .= ' DB_File';
1350 ++$unfixable_db_file;
1355 if ($options{'all-fixups'}) {
1360 apply_fixups($options{'early-fixup'});
1362 # if Encode is not needed for the test, you can speed up the bisect by
1363 # excluding it from the runs with -Dnoextensions=Encode
1364 # ccache is an easy win. Remove it if it causes problems.
1365 # Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
1366 # to true in hints/linux.sh
1367 # On dromedary, from that point on, Configure (by default) fails to find any
1368 # libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
1369 # versioned libraries. Without -lm, the build fails.
1370 # Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
1371 # until commit faae14e6e968e1c0 adds it to the hints.
1372 # However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
1373 # because it will spot versioned libraries, pass them to the compiler, and then
1374 # bail out pretty early on. Configure won't let us override libswanted, but it
1375 # will let us override the entire libs list.
1377 foreach (@{$options{A}}) {
1378 push @paths, $1 if /^libpth=(.*)/s;
1381 unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
1382 # Before 1cfa4ec74d4933da, so force the libs list.
1385 # This is the current libswanted list from Configure, less the libs removed
1386 # by current hints/linux.sh
1387 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl
1388 ld sun m crypt sec util c cposix posix ucb BSD)) {
1389 foreach my $dir (@paths) {
1390 # Note the wonderful consistency of dot-or-not in the config vars:
1391 next unless -f "$dir/lib$lib.$Config{dlext}"
1392 || -f "$dir/lib$lib$Config{lib_ext}";
1393 push @libs, "-l$lib";
1397 $defines{libs} = \@libs unless exists $defines{libs};
1400 $defines{usenm} = undef
1401 if $major < 2 && !exists $defines{usenm};
1403 my ($missing, $created_dirs);
1404 ($missing, $created_dirs) = force_manifest()
1405 if $options{'force-manifest'};
1408 foreach my $key (sort keys %defines) {
1409 my $val = $defines{$key};
1411 push @ARGS, "-D$key=@$val";
1412 } elsif (!defined $val) {
1413 push @ARGS, "-U$key";
1414 } elsif (!length $val) {
1415 push @ARGS, "-D$key";
1417 $val = "" if $val eq "\0";
1418 push @ARGS, "-D$key=$val";
1421 push @ARGS, map {"-A$_"} @{$options{A}};
1425 # Testing a module? We need to install perl/cpan modules to a temp dir
1426 if ($options{module} || $options{'with-module'} || $options{'test-module'})
1428 $prefix = tempdir(CLEANUP => 1);
1430 push @ARGS, "-Dprefix=$prefix";
1431 push @ARGS, "-Uversiononly", "-Dinstallusrbinperl=n";
1434 # If a file in MANIFEST is missing, Configure asks if you want to
1435 # continue (the default being 'n'). With stdin closed or /dev/null,
1436 # it exits immediately and the check for config.sh below will skip.
1437 # Without redirecting stdin, the commands called will attempt to read from
1438 # stdin (and thus effectively hang)
1439 run_with_options({stdin => '/dev/null', name => 'Configure'},
1440 './Configure', @ARGS);
1442 patch_SH() unless $options{'all-fixups'};
1443 apply_fixups($options{'late-fixup'});
1445 if (-f 'config.sh') {
1446 # Emulate noextensions if Configure doesn't support it.
1448 if $major < 10 && $defines{noextensions};
1449 if (system './Configure -S') {
1450 # See commit v5.23.5-89-g7a4fcb3. Configure may try to run
1451 # ./optdef.sh instead of UU/optdef.sh. Copying the file is
1452 # easier than patching Configure (which mentions optdef.sh multi-
1455 File::Copy::copy("UU/optdef.sh", "./optdef.sh");
1456 system_or_die('./Configure -S');
1460 if ($target =~ /config\.s?h/) {
1461 match_and_exit($target, @ARGV) if $match && -f $target;
1462 report_and_exit(-f $target, 'could build', 'could not build', $target)
1463 if $options{'test-build'};
1465 skip("could not build $target") unless -f $target;
1467 run_report_and_exit(@ARGV);
1468 } elsif (!-f 'config.sh') {
1469 # Skip if something went wrong with Configure
1471 skip('could not build config.sh');
1474 force_manifest_cleanup($missing, $created_dirs)
1477 if($options{'force-regen'}
1478 && extract_from_file('Makefile', qr/\bregen_headers\b/)) {
1479 # regen_headers was added in e50aee73b3d4c555, patch.1m for perl5.001
1480 # It's not worth faking it for earlier revisions.
1481 system_or_die('make regen_headers');
1484 unless ($options{'all-fixups'}) {
1489 # Parallel build for miniperl is safe
1490 system "$options{make} $j miniperl </dev/null";
1492 # This is the file we expect make to create
1493 my $expected_file = $target =~ /^test/ ? 't/perl'
1494 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
1496 # This is the target we tell make to build in order to get $expected_file
1497 my $real_target = $target eq 'Fcntl' ? $expected_file : $target;
1499 if ($target ne 'miniperl') {
1500 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
1501 $j = '' if $major < 10;
1503 if ($real_target eq 'test_prep') {
1505 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
1506 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
1507 # earlier than that, just make test. It will be fast enough.
1508 $real_target = extract_from_file('Makefile.SH',
1509 qr/^(test[-_]prep):/,
1514 system "$options{make} $j $real_target </dev/null";
1517 # Testing a cpan module? See if it will install
1519 if (my $mod_opt = $options{module} || $options{'with-module'}
1520 || ($just_testing++, $options{'test-module'})) {
1521 # First we need to install this perl somewhere
1522 system_or_die('./installperl');
1524 my @m = split(',', $mod_opt);
1526 my $bdir = File::Temp::tempdir(
1530 # Don't ever stop to ask the user for input
1531 $ENV{AUTOMATED_TESTING} = 1;
1532 $ENV{PERL_MM_USE_DEFAULT} = 1;
1534 # Don't let these interfere with our cpan installs
1535 delete $ENV{PERL_MB_OPT};
1536 delete $ENV{PERL_MM_OPT};
1538 # Make sure we load up our CPAN::MyConfig and then
1539 # override the build_dir so we have a fresh one
1541 my $cdir = $options{'cpan-config-dir'}
1542 || File::Spec->catfile($ENV{HOME},".cpan");
1549 "-e","\$CPAN::Config->{build_dir}=q{$bdir};",
1554 s/-/::/g if /-/ and !m|/|;
1556 my $install = join ",", map { "'$_'" } @m;
1557 if ($just_testing) {
1558 $install = "test($install)";
1559 } elsif ($options{'no-module-tests'}) {
1560 $install = "notest('install',$install)";
1562 $install = "install($install)";
1565 my $status_method = $just_testing ? 'test' : 'uptodate';
1566 my $shellcmd = "$install; die unless CPAN::Shell->expand(Module => '$last')->$status_method;";
1568 if ($options{module} || $options{'test-module'}) {
1569 run_report_and_exit(@cpanshell, $shellcmd);
1571 my $ret = run_with_options({setprgp => $options{setpgrp},
1572 timeout => $options{timeout},
1573 }, @cpanshell, $shellcmd);
1574 $ret &= 0xff if $options{crash};
1578 report_and_exit(!$ret, 'zero exit from', 'non-zero exit from', "@_");
1583 my $expected_file_found = $expected_file =~ /perl$/
1584 ? -x $expected_file : -r $expected_file;
1586 if ($expected_file_found && $expected_file eq 't/perl') {
1587 # Check that it isn't actually pointing to ../miniperl, which will happen
1588 # if the sanity check ./miniperl -Ilib -MExporter -e '<?>' fails, and
1589 # Makefile tries to run minitest.
1591 # Of course, helpfully sometimes it's called ../perl, other times .././perl
1592 # and who knows if that list is exhaustive...
1593 my ($dev0, $ino0) = stat 't/perl';
1594 my ($dev1, $ino1) = stat 'perl';
1595 unless (defined $dev0 && defined $dev1 && $dev0 == $dev1 && $ino0 == $ino1) {
1596 undef $expected_file_found;
1597 my $link = readlink $expected_file;
1598 warn "'t/perl' => '$link', not 'perl'";
1599 die_255("Could not realink t/perl: $!") unless defined $link;
1603 if ($options{'test-build'}) {
1604 report_and_exit($expected_file_found, 'could build', 'could not build',
1606 } elsif (!$expected_file_found) {
1607 skip("could not build $real_target");
1610 match_and_exit($real_target, @ARGV) if $match;
1612 if (defined $options{'one-liner'}) {
1613 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
1614 unshift @ARGV, map {('-e', $_)} @{$options{'one-liner'}};
1615 foreach (qw(c l w)) {
1616 unshift @ARGV, "-$_" if $options{$_};
1618 unshift @ARGV, "./$exe", '-Ilib';
1622 my $fh = open_or_die($ARGV[0]);
1624 unshift @ARGV, $1, '-Ilib'
1625 if $line =~ $run_with_our_perl;
1628 if ($options{valgrind}) {
1629 # Turns out to be too confusing to use an optional argument with the path
1630 # of the valgrind binary, as if --valgrind takes an optional argument,
1631 # then specifying it as the last option eats the first part of the testcase.
1632 # ie this: .../bisect.pl --valgrind testcase
1633 # is treated as --valgrind=testcase and as there is no test case given,
1634 # it's an invalid commandline, bailing out with the usage message.
1636 # Currently, the test script can't signal a skip with 125, so anything
1637 # non-zero would do. But to keep that option open in future, use 124
1638 unshift @ARGV, 'valgrind', '--error-exitcode=124';
1641 # This is what we came here to run:
1643 if (exists $Config{ldlibpthname}) {
1645 my $varname = $Config{ldlibpthname};
1646 my $cwd = Cwd::getcwd();
1647 if (defined $ENV{$varname}) {
1648 $ENV{$varname} = $cwd . $Config{path_sep} . $ENV{$varname};
1650 $ENV{$varname} = $cwd;
1654 run_report_and_exit(@ARGV);
1656 ############################################################################
1658 # Patching, editing and faking routines only below here.
1660 ############################################################################
1662 sub fake_noextensions {
1663 edit_file('config.sh', sub {
1664 my @lines = split /\n/, shift;
1665 my @ext = split /\s+/, $defines{noextensions};
1667 next unless /^extensions=/ || /^dynamic_ext/;
1668 foreach my $ext (@ext) {
1672 return join "\n", @lines;
1676 sub force_manifest {
1677 my (@missing, @created_dirs);
1678 my $fh = open_or_die('MANIFEST');
1680 next unless /^(\S+)/;
1681 # -d is special case needed (at least) between 27332437a2ed1941 and
1682 # bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread
1684 unless -f $1 || -d $1;
1688 foreach my $pathname (@missing) {
1689 my @parts = split '/', $pathname;
1690 my $leaf = pop @parts;
1693 $path .= '/' . shift @parts;
1695 mkdir $path, 0700 or die_255("Can't create $path: $!");
1696 unshift @created_dirs, $path;
1698 $fh = open_or_die($pathname, '>');
1700 chmod 0, $pathname or die_255("Can't chmod 0 $pathname: $!");
1702 return \@missing, \@created_dirs;
1705 sub force_manifest_cleanup {
1706 my ($missing, $created_dirs) = @_;
1707 # This is probably way too paranoid:
1710 foreach my $file (@$missing) {
1711 my (undef, undef, $mode, undef, undef, undef, undef, $size)
1713 if (!defined $mode) {
1714 push @errors, "Added file $file has been deleted by Configure";
1717 if (Fcntl::S_IMODE($mode) != 0) {
1719 sprintf 'Added file %s had mode changed by Configure to %03o',
1724 "Added file $file had sized changed by Configure to $size";
1726 unlink $file or die_255("Can't unlink $file: $!");
1728 foreach my $dir (@$created_dirs) {
1729 rmdir $dir or die_255("Can't rmdir $dir: $!");
1735 sub patch_Configure {
1737 if (extract_from_file('Configure',
1738 qr/^\t\t\*=\*\) echo "\$1" >> \$optdef;;$/)) {
1739 # This is " Spaces now allowed in -D command line options.",
1740 # part of commit ecfc54246c2a6f42
1741 apply_patch(<<'EOPATCH');
1742 diff --git a/Configure b/Configure
1743 index 3d3b38d..78ffe16 100755
1746 @@ -652,7 +777,8 @@ while test $# -gt 0; do
1747 echo "$me: use '-U symbol=', not '-D symbol='." >&2
1748 echo "$me: ignoring -D $1" >&2
1750 - *=*) echo "$1" >> $optdef;;
1751 + *=*) echo "$1" | \
1752 + sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
1753 *) echo "$1='define'" >> $optdef;;
1759 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
1760 # Configure's original simple "grep" for d_namlen falls foul of the
1761 # approach taken by the glibc headers:
1762 # #ifdef _DIRENT_HAVE_D_NAMLEN
1763 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
1765 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
1766 # This is also part of commit ecfc54246c2a6f42
1767 apply_patch(<<'EOPATCH');
1768 diff --git a/Configure b/Configure
1769 index 3d3b38d..78ffe16 100755
1772 @@ -3935,7 +4045,8 @@ $rm -f try.c
1774 : see if the directory entry stores field length
1776 -if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
1777 +$cppstdin $cppflags $cppminus < "$xinc" > try.c
1778 +if $contains 'd_namlen' try.c >/dev/null 2>&1; then
1779 echo "Good, your directory entry keeps length information in d_namlen." >&4
1787 && !extract_from_file('Configure',
1788 qr/Try to guess additional flags to pick up local libraries/)) {
1789 my $mips = extract_from_file('Configure',
1790 qr!(''\) if (?:\./)?mips; then)!);
1791 # This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to
1792 # the ld flags if libraries are found there. It shifts the code to set
1793 # up libpth earlier, and then adds the code to add libpth entries to
1795 # mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g
1796 apply_patch(sprintf <<'EOPATCH', $mips);
1797 diff --git a/Configure b/Configure
1798 index 53649d5..0635a6e 100755
1801 @@ -2749,6 +2749,52 @@ EOM
1805 +: Set private lib path
1807 +'') if ./mips; then
1808 + plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
1813 +'') dlist="$plibpth $glibpth";;
1814 +*) dlist="$libpth";;
1817 +: Now check and see which directories actually exist, avoiding duplicates
1821 + if $test -d $xxx; then
1822 + case " $libpth " in
1824 + *) libpth="$libpth $xxx";;
1830 +Some systems have incompatible or broken versions of libraries. Among
1831 +the directories listed in the question below, please remove any you
1832 +know not to be holding relevant libraries, and add any that are needed.
1833 +Say "none" for none.
1844 +rp="Directories to use for library searches?"
1851 : flags used in final linking phase
1853 '') if ./venix; then
1854 @@ -2765,6 +2811,23 @@ case "$ldflags" in
1856 *) dflt="$ldflags";;
1859 +: Possible local library directories to search.
1860 +loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
1861 +loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
1863 +: Try to guess additional flags to pick up local libraries.
1864 +for thislibdir in $libpth; do
1865 + case " $loclibpth " in
1866 + *" $thislibdir "*)
1868 + "-L$thislibdir ") ;;
1869 + *) dflt="$dflt -L$thislibdir" ;;
1876 rp="Any additional ld flags (NOT including libraries)?"
1878 @@ -2828,52 +2891,6 @@ n) echo "OK, that should do.";;
1880 $rm -f try try.* core
1882 -: Set private lib path
1885 - plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
1890 -'') dlist="$plibpth $glibpth";;
1891 -*) dlist="$libpth";;
1894 -: Now check and see which directories actually exist, avoiding duplicates
1898 - if $test -d $xxx; then
1899 - case " $libpth " in
1901 - *) libpth="$libpth $xxx";;
1907 -Some systems have incompatible or broken versions of libraries. Among
1908 -the directories listed in the question below, please remove any you
1909 -know not to be holding relevant libraries, and add any that are needed.
1910 -Say "none" for none.
1921 -rp="Directories to use for library searches?"
1928 : compute shared library extension
1934 if ($major == 4 && extract_from_file('Configure', qr/^d_gethbynam=/)) {
1935 # Fixes a bug introduced in 4599a1dedd47b916
1936 apply_commit('3cbc818d1d0ac470');
1939 if ($major == 4 && extract_from_file('Configure',
1940 qr/gethbadd_addr_type=`echo \$gethbadd_addr_type/)) {
1941 # Fixes a bug introduced in 3fd537d4b944bc7a
1942 apply_commit('6ff9219da6cf8cfd');
1945 if ($major == 4 && extract_from_file('Configure',
1946 qr/^pthreads_created_joinable=/)) {
1947 # Fix for bug introduced in 52e1cb5ebf5e5a8c
1948 # Part of commit ce637636a41b2fef
1949 edit_file('Configure', sub {
1951 $code =~ s{^pthreads_created_joinable=''}
1952 {d_pthreads_created_joinable=''}ms
1953 or die_255("Substitution failed");
1954 $code =~ s{^pthreads_created_joinable='\$pthreads_created_joinable'}
1955 {d_pthreads_created_joinable='\$d_pthreads_created_joinable'}ms
1956 or die_255("Substitution failed");
1961 if ($major < 5 && extract_from_file('Configure',
1962 qr!if \$cc \$ccflags try\.c -o try >/dev/null 2>&1; then!)) {
1963 # Analogous to the more general fix of dfe9444ca7881e71
1964 # Without this flags such as -m64 may not be passed to this compile,
1965 # which results in a byteorder of '1234' instead of '12345678', which
1966 # can then cause crashes.
1968 if (extract_from_file('Configure', qr/xxx_prompt=y/)) {
1969 # 8e07c86ebc651fe9 or later
1970 # ("This is my patch patch.1n for perl5.001.")
1971 apply_patch(<<'EOPATCH');
1972 diff --git a/Configure b/Configure
1973 index 62249dd..c5c384e 100755
1976 @@ -8247,7 +8247,7 @@ main()
1980 - if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
1981 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
1984 [1-4][1-4][1-4][1-4]|12345678|87654321)
1987 apply_patch(<<'EOPATCH');
1988 diff --git a/Configure b/Configure
1989 index 53649d5..f1cd64a 100755
1992 @@ -6362,7 +6362,7 @@ main()
1996 - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
1997 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 ; then
2000 ????|????????) echo "(The test program ran ok.)";;
2005 if ($major < 6 && !extract_from_file('Configure',
2007 # This adds the -A option to Configure, which is incredibly useful
2008 # Effectively this is commits 02e93a22d20fc9a5, 5f83a3e9d818c3ad,
2009 # bde6b06b2c493fef, f7c3111703e46e0c and 2 lines of trailing whitespace
2010 # removed by 613d6c3e99b9decc, but applied at slightly different
2011 # locations to ensure a clean patch back to 5.000
2012 # Note, if considering patching to the intermediate revisions to fix
2013 # bugs in -A handling, f7c3111703e46e0c is from 2002, and hence
2016 # To add to the fun, early patches add -K and -O options, and it's not
2017 # trivial to get patch to put the C<. ./posthint.sh> in the right place
2018 edit_file('Configure', sub {
2020 $code =~ s/(optstr = ")([^"]+";\s*# getopt-style specification)/$1A:$2/
2021 or die_255("Substitution failed");
2022 $code =~ s!^(: who configured the system)!
2027 or die_255("Substitution failed");
2030 apply_patch(<<'EOPATCH');
2031 diff --git a/Configure b/Configure
2032 index 4b55fa6..60c3c64 100755
2035 @@ -1150,6 +1150,7 @@ set X `for arg in "$@"; do echo "X$arg"; done |
2041 : set up default values
2043 @@ -1172,6 +1173,56 @@ while test $# -gt 0; do
2045 -d) shift; fastread=yes;;
2046 -e) shift; alldone=cont;;
2054 + *=*) zzz=`echo "$yyy"|sed 's!=.*!!'`
2058 + zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'`
2059 + yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
2064 + '') case "$yyy" in
2065 + *:*) xxx=`echo "$yyy"|sed 's!:.*!!'`
2066 + yyy=`echo "$yyy"|sed 's!^[^:]*:!!'`
2067 + zzz=`echo "$yyy"|sed 's!^[^=]*=!!'`
2068 + yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
2069 + *) xxx=`echo "$yyy"|sed 's!:.*!!'`
2070 + yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;;
2076 + echo "$yyy=\"\${$yyy}$zzz\"" >> posthint.sh ;;
2078 + echo "$yyy=''" >> posthint.sh ;;
2083 + echo "$yyy='$zzz'" >> posthint.sh ;;
2085 + echo "eval \"$yyy=$zzz\"" >> posthint.sh ;;
2087 + echo "$yyy=\"$zzz\${$yyy}\"" >> posthint.sh ;;
2092 + echo "$yyy=$zzz" >> posthint.sh ;;
2093 + *) echo "$me: unknown -A command '$xxx', ignoring -A $1" >&2 ;;
2103 if ($major < 8 && $^O eq 'aix') {
2104 edit_file('Configure', sub {
2106 # Replicate commit a8c676c69574838b
2107 # Whitespace allowed at the ends of /lib/syscalls.exp lines
2108 # and half of commit c6912327ae30e6de
2109 # AIX syscalls.exp scan: the syscall might be marked 32, 3264, or 64
2110 $code =~ s{(\bsed\b.*\bsyscall)(?:\[0-9\]\*)?(\$.*/lib/syscalls\.exp)}
2111 {$1 . "[0-9]*[ \t]*" . $2}e;
2116 if ($major < 8 && !extract_from_file('Configure',
2117 qr/^\t\tif test ! -t 0; then$/)) {
2118 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was
2119 # not a tty. With that commit, the tty requirement was dropped for -de
2121 # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S
2122 # For those older versions, it's probably easiest if we simply remove
2124 edit_file('Configure', sub {
2126 $code =~ s/test ! -t 0/test Perl = rules/;
2131 if ($major == 8 || $major == 9) {
2132 # Fix symbol detection to that of commit 373dfab3839ca168 if it's any
2133 # intermediate version 5129fff43c4fe08c or later, as the intermediate
2134 # versions don't work correctly on (at least) Sparc Linux.
2135 # 5129fff43c4fe08c adds the first mention of mistrustnm.
2136 # 373dfab3839ca168 removes the last mention of lc=""
2137 edit_file('Configure', sub {
2140 if $code !~ /\btc="";/; # 373dfab3839ca168 or later
2142 if $code !~ /\bmistrustnm\b/; # before 5129fff43c4fe08c
2143 my $fixed = <<'EOC';
2145 : is a C symbol defined?
2148 -v) tf=libc.tmp; tdc="";;
2149 -a) tf=libc.tmp; tdc="[]";;
2150 *) tlook="^$1\$"; tf=libc.list; tdc="()";;
2153 case "$reuseval-$4" in
2155 true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;;
2160 if $test "$runnm" = true; then
2161 if $contains $tlook $tf >/dev/null 2>&1; then
2163 elif $test "$mistrustnm" = compile -o "$mistrustnm" = run; then
2164 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
2165 $cc -o try $optimize $ccflags $ldflags try.c >/dev/null 2>&1 $libs && tval=true;
2166 $test "$mistrustnm" = run -a -x try && { $run ./try$_exe >/dev/null 2>&1 || tval=false; };
2167 $rm -f try$_exe try.c core core.* try.core;
2170 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
2171 $cc -o try $optimize $ccflags $ldflags try.c $libs >/dev/null 2>&1 && tval=true;
2172 $rm -f try$_exe try.c;
2177 $define) tval=true;;
2185 $code =~ s/\n: is a C symbol defined\?\n.*?\neval "\$2=\$tval"'\n\n/$fixed/sm
2186 or die_255("substitution failed");
2192 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
2193 # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as
2194 # prior to bd9b35c97ad661cc Configure had the malloc.h test before the
2195 # definition of $compile.
2196 apply_patch(<<'EOPATCH');
2197 diff --git a/Configure b/Configure
2198 index 3d2e8b9..6ce7766 100755
2201 @@ -6743,5 +6743,22 @@ set d_dosuid
2203 : see if this is a malloc.h system
2204 -set malloc.h i_malloc
2206 +: we want a real compile instead of Inhdr because some systems have a
2207 +: malloc.h that just gives a compile error saying to use stdlib.h instead
2210 +#include <stdlib.h>
2211 +#include <malloc.h>
2212 +int main () { return 0; }
2215 +if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then
2216 + echo "<malloc.h> found." >&4
2219 + echo "<malloc.h> NOT found." >&4
2231 if ($^O eq 'freebsd') {
2232 # There are rather too many version-specific FreeBSD hints fixes to
2233 # patch individually. Also, more than once the FreeBSD hints file has
2234 # been written in what turned out to be a rather non-future-proof style,
2235 # with case statements treating the most recent version as the
2236 # exception, instead of treating previous versions' behaviour explicitly
2237 # and changing the default to cater for the current behaviour. (As
2238 # strangely, future versions inherit the current behaviour.)
2239 checkout_file('hints/freebsd.sh');
2240 } elsif ($^O eq 'darwin') {
2242 # We can't build on darwin without some of the data in the hints
2243 # file. Probably less surprising to use the earliest version of
2244 # hints/darwin.sh and then edit in place just below, than use
2245 # blead's version, as that would create a discontinuity at
2246 # f556e5b971932902 - before it, hints bugs would be "fixed", after
2247 # it they'd resurface. This way, we should give the illusion of
2248 # monotonic bug fixing.
2250 if (!-f 'hints/darwin.sh') {
2251 checkout_file('hints/darwin.sh', 'f556e5b971932902');
2255 edit_file('hints/darwin.sh', sub {
2257 # Part of commit 8f4f83badb7d1ba9, which mostly undoes
2258 # commit 0511a818910f476c.
2259 $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m;
2260 # commit 14c11978e9b52e08/803bb6cc74d36a3f
2261 # Without this, code in libperl.bundle links against op.o
2262 # in preference to opmini.o on the linker command line,
2263 # and hence miniperl tries to use File::Glob instead of
2265 $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m;
2266 # f556e5b971932902 also patches Makefile.SH with some
2267 # special case code to deal with useshrplib for darwin.
2268 # Given that post 5.8.0 the darwin hints default was
2269 # changed to false, and it would be very complex to splice
2270 # in that code in various versions of Makefile.SH back
2271 # to 5.002, lets just turn it off.
2272 $code =~ s/^useshrplib='true'/useshrplib='false'/m
2275 # Part of commit d235852b65d51c44
2276 # Don't do this on a case sensitive HFS+ partition, as it
2277 # breaks the build for 5.003 and earlier.
2278 if ($case_insensitive
2279 && $code !~ /^firstmakefile=GNUmakefile/) {
2280 $code .= "\nfirstmakefile=GNUmakefile;\n";
2286 } elsif ($^O eq 'netbsd') {
2288 # These are part of commit 099685bc64c7dbce
2289 edit_file('hints/netbsd.sh', sub {
2291 my $fixed = <<'EOC';
2297 if [ -f /usr/libexec/ld.elf_so ]; then
2300 ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
2301 cccdlflags="-DPIC -fPIC $cccdlflags"
2302 lddlflags="--whole-archive -shared $lddlflags"
2303 elif [ "`uname -m`" = "pmax" ]; then
2304 # NetBSD 1.3 and 1.3.1 on pmax shipped an 'old' ld.so, which will not work.
2306 elif [ -f /usr/libexec/ld.so ]; then
2309 ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags"
2310 # we use -fPIC here because -fpic is *NOT* enough for some of the
2311 # extensions like Tk on some netbsd platforms (the sparc is one)
2312 cccdlflags="-DPIC -fPIC $cccdlflags"
2313 lddlflags="-Bforcearchive -Bshareable $lddlflags"
2320 $code =~ s/^case "\$osvers" in\n0\.9\|0\.8.*?^esac\n/$fixed/ms;
2324 } elsif ($^O eq 'openbsd') {
2326 checkout_file('hints/openbsd.sh', '43051805d53a3e4c')
2327 unless -f 'hints/openbsd.sh';
2328 my $which = extract_from_file('hints/openbsd.sh',
2329 qr/# from (2\.8|3\.1) onwards/,
2332 my $was = extract_from_file('hints/openbsd.sh',
2333 qr/(lddlflags="(?:-Bforcearchive )?-Bshareable)/);
2334 # This is commit 154d43cbcf57271c and parts of 5c75dbfa77b0949c
2335 # and 29b5585702e5e025
2336 apply_patch(sprintf <<'EOPATCH', $was);
2337 diff --git a/hints/openbsd.sh b/hints/openbsd.sh
2338 index a7d8bf2..5b79709 100644
2339 --- a/hints/openbsd.sh
2340 +++ b/hints/openbsd.sh
2341 @@ -37,7 +37,25 @@ OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax)
2342 # we use -fPIC here because -fpic is *NOT* enough for some of the
2343 # extensions like Tk on some OpenBSD platforms (ie: sparc)
2344 cccdlflags="-DPIC -fPIC $cccdlflags"
2347 + [01].*|2.[0-7]|2.[0-7].*)
2348 + lddlflags="-Bshareable $lddlflags"
2352 + lddlflags="-shared -fPIC $lddlflags"
2354 + *) # from 3.1 onwards
2356 + lddlflags="-shared -fPIC $lddlflags"
2357 + libswanted=`echo $libswanted | sed 's/ dl / /'`
2361 + # We need to force ld to export symbols on ELF platforms.
2362 + # Without this, dlopen() is crippled.
2363 + ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2364 + test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2369 } elsif ($which eq '2.8') {
2370 # This is parts of 5c75dbfa77b0949c and 29b5585702e5e025, and
2371 # possibly eb9cd59d45ad2908
2372 my $was = extract_from_file('hints/openbsd.sh',
2373 qr/lddlflags="(-shared(?: -fPIC)?) \$lddlflags"/);
2375 apply_patch(sprintf <<'EOPATCH', $was);
2376 --- a/hints/openbsd.sh 2011-10-21 17:25:20.000000000 +0200
2377 +++ b/hints/openbsd.sh 2011-10-21 16:58:43.000000000 +0200
2379 [01].*|2.[0-7]|2.[0-7].*)
2380 lddlflags="-Bshareable $lddlflags"
2382 - *) # from 2.8 onwards
2385 - lddlflags="%s $lddlflags"
2386 + lddlflags="-shared -fPIC $lddlflags"
2388 + *) # from 3.1 onwards
2390 + lddlflags="-shared -fPIC $lddlflags"
2391 + libswanted=`echo $libswanted | sed 's/ dl / /'`
2395 + # We need to force ld to export symbols on ELF platforms.
2396 + # Without this, dlopen() is crippled.
2397 + ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2398 + test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2403 } elsif ($which eq '3.1'
2404 && !extract_from_file('hints/openbsd.sh',
2405 qr/We need to force ld to export symbols on ELF platforms/)) {
2406 # This is part of 29b5585702e5e025
2407 apply_patch(<<'EOPATCH');
2408 diff --git a/hints/openbsd.sh b/hints/openbsd.sh
2409 index c6b6bc9..4839d04 100644
2410 --- a/hints/openbsd.sh
2411 +++ b/hints/openbsd.sh
2412 @@ -54,6 +54,11 @@ alpha-2.[0-8]|mips-*|vax-*|powerpc-2.[0-7]|m88k-*)
2413 libswanted=`echo $libswanted | sed 's/ dl / /'`
2417 + # We need to force ld to export symbols on ELF platforms.
2418 + # Without this, dlopen() is crippled.
2419 + ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2420 + test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2427 } elsif ($^O eq 'linux') {
2429 # sparc linux seems to need the -Dbool=char -DHAS_BOOL part of
2430 # perl5.000 patch.0n: [address Configure and build issues]
2431 edit_file('hints/linux.sh', sub {
2433 $code =~ s!-I/usr/include/bsd!-Dbool=char -DHAS_BOOL!g;
2439 if (`uname -sm` =~ qr/^Linux sparc/) {
2440 if (extract_from_file('hints/linux.sh', qr/sparc-linux/)) {
2441 # Be sure to use -fPIC not -fpic on Linux/SPARC
2442 apply_commit('f6527d0ef0c13ad4');
2443 } elsif(!extract_from_file('hints/linux.sh',
2444 qr/^sparc-linux\)$/)) {
2445 my $fh = open_or_die('hints/linux.sh', '>>');
2446 print $fh <<'EOT' or die_255($!);
2448 case "`uname -m`" in
2450 case "$cccdlflags" in
2451 *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
2452 *) cccdlflags="$cccdlflags -fPIC" ;;
2461 } elsif ($^O eq 'solaris') {
2462 if (($major == 13 || $major == 14)
2463 && extract_from_file('hints/solaris_2.sh', qr/getconfldllflags/)) {
2464 apply_commit('c80bde4388070c45');
2470 # Cwd.xs added in commit 0d2079faa739aaa9. Cwd.pm moved to ext/ 8 years
2471 # later in commit 403f501d5b37ebf0
2472 if ($major > 0 && <*/Cwd/Cwd.xs>) {
2474 && !extract_from_file('Makefile.SH', qr/^extra_dep=''$/)) {
2475 # The Makefile.PL for Unicode::Normalize needs
2476 # lib/unicore/CombiningClass.pl. Even without a parallel build, we
2477 # need a dependency to ensure that it builds. This is a variant of
2478 # commit 9f3ef600c170f61e. Putting this for earlier versions gives
2479 # us a spot on which to hang the edits below
2480 apply_patch(<<'EOPATCH');
2481 diff --git a/Makefile.SH b/Makefile.SH
2482 index f61d0db..6097954 100644
2485 @@ -155,10 +155,20 @@ esac
2487 : Prepare dependency lists for Makefile.
2490 for f in $dynamic_ext; do
2491 : the dependency named here will never exist
2492 base=`echo "$f" | sed 's/.*\///'`
2493 - dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
2494 + this_target="lib/auto/$f/$base.$dlext"
2495 + dynamic_list="$dynamic_list $this_target"
2497 + : Parallel makes reveal that we have some interdependencies
2499 + Math/BigInt/FastCalc) extra_dep="$extra_dep
2500 +$this_target: lib/auto/List/Util/Util.$dlext" ;;
2501 + Unicode/Normalize) extra_dep="$extra_dep
2502 +$this_target: lib/unicore/CombiningClass.pl" ;;
2507 @@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
2508 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
2511 +$spitshell >>Makefile <<EOF
2515 +$spitshell >>Makefile <<'!NO!SUBS!'
2520 if ($major == 15 && $^O !~ /^(linux|darwin|.*bsd)$/
2521 && extract_from_file('Makefile.SH', qr/^V.* \?= /)) {
2522 # Remove the GNU-make-ism (which the BSD makes also support, but
2523 # most other makes choke on)
2524 apply_patch(<<'EOPATCH');
2525 diff --git a/Makefile.SH b/Makefile.SH
2526 index 94952bd..13e9001 100755
2529 @@ -338,8 +338,8 @@ linux*|darwin)
2530 $spitshell >>$Makefile <<!GROK!THIS!
2531 # If you're going to use valgrind and it can't be invoked as plain valgrind
2532 # then you'll need to change this, or override it on the make command line.
2533 -VALGRIND ?= valgrind
2534 -VG_TEST ?= ./perl -e 1 2>/dev/null
2535 +VALGRIND = valgrind
2536 +VG_TEST = ./perl -e 1 2>/dev/null
2544 if (extract_from_file('patchlevel.h',
2545 qr/^#include "unpushed\.h"/)) {
2546 # I had thought it easier to detect when building one of the 52
2547 # commits with the original method of incorporating the git
2548 # revision and drop parallel make flags. Commits shown by
2549 # git log 46807d8e809cc127^..dcff826f70bf3f64^ ^d4fb0a1f15d1a1c4
2550 # However, it's not actually possible to make miniperl for that
2551 # configuration as-is, because the file .patchnum is only made
2552 # as a side effect of target 'all'
2553 # I also don't think that it's "safe" to simply run
2554 # make_patchnum.sh before the build. We need the proper
2555 # dependency rules in the Makefile to *stop* it being run again
2556 # at the wrong time.
2557 # This range is important because contains the commit that
2558 # merges Schwern's y2038 work.
2559 apply_patch(<<'EOPATCH');
2560 diff --git a/Makefile.SH b/Makefile.SH
2561 index 9ad8b6f..106e721 100644
2564 @@ -540,9 +544,14 @@ sperl.i: perl.c $(h)
2566 .PHONY: all translators utilities make_patchnum
2569 +make_patchnum: lib/Config_git.pl
2571 +lib/Config_git.pl: make_patchnum.sh
2572 sh $(shellflags) make_patchnum.sh
2574 +# .patchnum, unpushed.h and lib/Config_git.pl are built by make_patchnum.sh
2575 +unpushed.h .patchnum: lib/Config_git.pl
2577 # make sure that we recompile perl.c if .patchnum changes
2578 perl$(OBJ_EXT): .patchnum unpushed.h
2581 } elsif (-f '.gitignore'
2582 && extract_from_file('.gitignore', qr/^\.patchnum$/)) {
2583 # 8565263ab8a47cda to 46807d8e809cc127^ inclusive.
2584 edit_file('Makefile.SH', sub {
2586 $code =~ s/^make_patchnum:\n/make_patchnum: .patchnum
2590 .patchnum: make_patchnum.sh
2594 } elsif (-f 'lib/.gitignore'
2595 && extract_from_file('lib/.gitignore',
2596 qr!^/Config_git.pl!)
2597 && !extract_from_file('Makefile.SH',
2598 qr/^uudmap\.h.*:bitcount.h$/)) {
2599 # Between commits and dcff826f70bf3f64 and 0f13ebd5d71f8177^
2600 edit_file('Makefile.SH', sub {
2602 # Bug introduced by 344af494c35a9f0f
2603 # fixed in 0f13ebd5d71f8177
2604 $code =~ s{^(pod/perlapi\.pod) (pod/perlintern\.pod): }
2606 # Bug introduced by efa50c51e3301a2c
2607 # fixed in 0f13ebd5d71f8177
2608 $code =~ s{^(uudmap\.h) (bitcount\.h): }
2611 # The rats nest of getting git_version.h correct
2613 if ($code =~ s{git_version\.h: stock_git_version\.h
2614 \tcp stock_git_version\.h git_version\.h}
2616 # before 486cd780047ff224
2618 # We probably can't build between
2619 # 953f6acfa20ec275^ and 8565263ab8a47cda
2620 # inclusive, but all commits in that range
2621 # relate to getting make_patchnum.sh working,
2622 # so it is extremely unlikely to be an
2623 # interesting bisect target. They will skip.
2625 # No, don't spawn a submake if
2626 # make_patchnum.sh or make_patchnum.pl fails
2627 $code =~ s{\|\| \$\(MAKE\) miniperl.*}
2629 $code =~ s{^\t(sh.*make_patchnum\.sh.*)}
2632 # Use an external perl to run make_patchnum.pl
2633 # because miniperl still depends on
2635 $code =~ s{^\t.*make_patchnum\.pl}
2636 {\t-$^X make_patchnum.pl}m;
2639 # "Truth in advertising" - running
2640 # make_patchnum generates 2 files.
2641 $code =~ s{^make_patchnum:.*}{
2642 make_patchnum: lib/Config_git.pl
2644 git_version.h: lib/Config_git.pl
2646 perlmini\$(OBJ_EXT): git_version.h
2648 lib/Config_git.pl:}m;
2650 # Right, now we've corrected Makefile.SH to
2651 # correctly describe how lib/Config_git.pl and
2652 # git_version.h are made, we need to fix the rest
2654 # This emulates commit 2b63e250843b907e
2655 # This might duplicate the rule stating that
2656 # git_version.h depends on lib/Config_git.pl
2658 $code =~ s{^(?:lib/Config_git\.pl )?git_version\.h: (.* make_patchnum\.pl.*)}
2659 {git_version.h: lib/Config_git.pl
2661 lib/Config_git.pl: $1}m;
2663 # This emulates commits 0f13ebd5d71f8177 and
2664 # and a04d4598adc57886. It ensures that
2665 # lib/Config_git.pl is built before configpm,
2666 # and that configpm is run exactly once.
2667 $code =~ s{^(\$\(.*?\) )?(\$\(CONFIGPOD\))(: .*? configpm Porting/Glossary)( lib/Config_git\.pl)?}{
2668 # If present, other files depend on $(CONFIGPOD)
2669 ($1 ? "$1: $2\n\n" : '')
2670 # Then the rule we found
2672 # Add dependency if not there
2673 . ($4 ? $4 : ' lib/Config_git.pl')
2682 # Commits dc0655f797469c47 and d11a62fe01f2ecb2
2683 edit_file('Makefile.SH', sub {
2685 foreach my $ext (qw(Encode SDBM_File)) {
2686 next if $code =~ /\b$ext\) extra_dep=/s;
2687 $code =~ s!(\) extra_dep="\$extra_dep
2688 \$this_target: .*?" ;;)
2691 $ext) extra_dep="\$extra_dep
2692 \$this_target: lib/auto/Cwd/Cwd.\$dlext" ;;
2701 # Remove commits 9fec149bb652b6e9 and 5bab1179608f81d8, which add/amend
2702 # rules to automatically run regen scripts that rebuild C headers. These
2703 # cause problems because a git checkout doesn't preserve relative file
2704 # modification times, hence the regen scripts may fire. This will
2705 # obscure whether the repository had the correct generated headers
2707 # Also, the dependency rules for running the scripts were not correct,
2708 # which could cause spurious re-builds on re-running make, and can cause
2709 # complete build failures for a parallel make.
2710 if (extract_from_file('Makefile.SH',
2711 qr/Writing it this way gives make a big hint to always run opcode\.pl before/)) {
2712 apply_commit('70c6e6715e8fec53');
2713 } elsif (extract_from_file('Makefile.SH',
2714 qr/^opcode\.h opnames\.h pp_proto\.h pp\.sym: opcode\.pl$/)) {
2715 revert_commit('9fec149bb652b6e9');
2719 if ($^O eq 'aix' && $major >= 11 && $major <= 15
2720 && extract_from_file('makedef.pl', qr/^use Config/)) {
2721 edit_file('Makefile.SH', sub {
2722 # The AIX part of commit e6807d8ab22b761c
2723 # It's safe to substitute lib/Config.pm for config.sh
2724 # as lib/Config.pm depends on config.sh
2725 # If the tree is post e6807d8ab22b761c, the substitution
2726 # won't match, which is harmless.
2728 $code =~ s{^(perl\.exp:.* )config\.sh(\b.*)}
2729 {$1 . '$(CONFIGPM)' . $2}me;
2734 # There was a bug in makedepend.SH which was fixed in version 96a8704c.
2735 # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
2736 # Remove this if you're actually bisecting a problem related to
2738 # If you do this, you may need to add in code to correct the output of older
2739 # makedepends, which don't correctly filter newer gcc output such as
2741 checkout_file('makedepend.SH');
2743 if ($major < 4 && -f 'config.sh'
2744 && !extract_from_file('config.sh', qr/^trnl=/)) {
2745 # This seems to be necessary to avoid makedepend becoming confused,
2746 # and hanging on stdin. Seems that the code after
2747 # make shlist || ...here... is never run.
2748 edit_file('makedepend.SH', sub {
2750 $code =~ s/^trnl='\$trnl'$/trnl='\\n'/m;
2757 # This is ordered by $major, as it's likely that different platforms may
2758 # well want to share code.
2760 if ($major == 2 && extract_from_file('perl.c', qr/^\tfclose\(e_fp\);$/)) {
2761 # need to patch perl.c to avoid calling fclose() twice on e_fp when
2763 # This diff is part of commit ab821d7fdc14a438. The second close was
2764 # introduced with perl-5.002, commit a5f75d667838e8e7
2765 # Might want a6c477ed8d4864e6 too, for the corresponding change to
2766 # pp_ctl.c (likely without this, eval will have "fun")
2767 apply_patch(<<'EOPATCH');
2768 diff --git a/perl.c b/perl.c
2769 index 03c4d48..3c814a2 100644
2772 @@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
2773 #ifndef VMS /* VMS doesn't have environ array */
2774 origenviron = environ;
2776 + e_tmpname = Nullch;
2780 @@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
2782 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
2783 croak("Can't write to temp file for -e: %s", Strerror(errno));
2786 scriptname = e_tmpname;
2788 @@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
2789 curcop->cop_line = 0;
2790 curstash = defstash;
2796 (void)UNLINK(e_tmpname);
2797 + Safefree(e_tmpname);
2798 + e_tmpname = Nullch;
2801 /* now that script is parsed, we can modify record separator */
2802 @@ -1369,7 +1371,7 @@ SV *sv;
2803 scriptname = xfound;
2806 - origfilename = savepv(e_fp ? "-e" : scriptname);
2807 + origfilename = savepv(e_tmpname ? "-e" : scriptname);
2808 curcop->cop_filegv = gv_fetchfile(origfilename);
2809 if (strEQ(origfilename,"-"))
2815 if ($major < 3 && $^O eq 'openbsd'
2816 && !extract_from_file('pp_sys.c', qr/BSD_GETPGRP/)) {
2817 # Part of commit c3293030fd1b7489
2818 apply_patch(<<'EOPATCH');
2819 diff --git a/pp_sys.c b/pp_sys.c
2820 index 4608a2a..f0c9d1d 100644
2823 @@ -2903,8 +2903,8 @@ PP(pp_getpgrp)
2828 - value = (I32)getpgrp(pid);
2830 + value = (I32)BSD_GETPGRP(pid);
2833 DIE("POSIX getpgrp can't take an argument");
2834 @@ -2933,8 +2933,8 @@ PP(pp_setpgrp)
2837 TAINT_PROPER("setpgrp");
2839 - SETi( setpgrp(pid, pgrp) >= 0 );
2841 + SETi( BSD_SETPGRP(pid, pgrp) >= 0 );
2843 if ((pgrp != 0) || (pid != 0)) {
2844 DIE("POSIX setpgrp can't take an argument");
2848 if ($major < 4 && $^O eq 'openbsd') {
2850 # Need changes from commit a6e633defa583ad5.
2851 # Commits c07a80fdfe3926b5 and f82b3d4130164d5f changed the same part
2854 if (extract_from_file('perl.h',
2855 qr/^#ifdef HAS_GETPGRP2$/)) {
2859 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2860 #define TAINT_ENV() if (tainting) taint_env()
2862 ! #ifdef HAS_GETPGRP2
2863 ! # ifndef HAS_GETPGRP
2864 ! # define HAS_GETPGRP
2868 ! #ifdef HAS_SETPGRP2
2869 ! # ifndef HAS_SETPGRP
2870 ! # define HAS_SETPGRP
2875 } elsif (extract_from_file('perl.h',
2876 qr/Gack, you have one but not both of getpgrp2/)) {
2880 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2881 #define TAINT_ENV() if (tainting) taint_env()
2883 ! #if defined(HAS_GETPGRP2) && defined(HAS_SETPGRP2)
2884 ! # define getpgrp getpgrp2
2885 ! # define setpgrp setpgrp2
2886 ! # ifndef HAS_GETPGRP
2887 ! # define HAS_GETPGRP
2889 ! # ifndef HAS_SETPGRP
2890 ! # define HAS_SETPGRP
2892 ! # ifndef USE_BSDPGRP
2893 ! # define USE_BSDPGRP
2896 ! # if defined(HAS_GETPGRP2) || defined(HAS_SETPGRP2)
2897 ! #include "Gack, you have one but not both of getpgrp2() and setpgrp2()."
2902 } elsif (extract_from_file('perl.h',
2903 qr/^#ifdef USE_BSDPGRP$/)) {
2907 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2908 #define TAINT_ENV() if (tainting) taint_env()
2910 ! #ifdef USE_BSDPGRP
2911 ! # ifdef HAS_GETPGRP
2912 ! # define BSD_GETPGRP(pid) getpgrp((pid))
2914 ! # ifdef HAS_SETPGRP
2915 ! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
2918 ! # ifdef HAS_GETPGRP2
2919 ! # define BSD_GETPGRP(pid) getpgrp2((pid))
2920 ! # ifndef HAS_GETPGRP
2921 ! # define HAS_GETPGRP
2924 ! # ifdef HAS_SETPGRP2
2925 ! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
2926 ! # ifndef HAS_SETPGRP
2927 ! # define HAS_SETPGRP
2932 #ifndef _TYPES_ /* If types.h defines this it's easy. */
2936 apply_patch(<<"EOPATCH");
2937 *** a/perl.h 2011-10-21 09:46:12.000000000 +0200
2938 --- b/perl.h 2011-10-21 09:46:12.000000000 +0200
2940 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
2941 #define TAINT_ENV() if (tainting) taint_env()
2943 ! /* XXX All process group stuff is handled in pp_sys.c. Should these
2944 ! defines move there? If so, I could simplify this a lot. --AD 9/96.
2946 ! /* Process group stuff changed from traditional BSD to POSIX.
2947 ! perlfunc.pod documents the traditional BSD-style syntax, so we'll
2948 ! try to preserve that, if possible.
2950 ! #ifdef HAS_SETPGID
2951 ! # define BSD_SETPGRP(pid, pgrp) setpgid((pid), (pgrp))
2953 ! # if defined(HAS_SETPGRP) && defined(USE_BSD_SETPGRP)
2954 ! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
2956 ! # ifdef HAS_SETPGRP2 /* DG/UX */
2957 ! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
2961 ! #if defined(BSD_SETPGRP) && !defined(HAS_SETPGRP)
2962 ! # define HAS_SETPGRP /* Well, effectively it does . . . */
2965 ! /* getpgid isn't POSIX, but at least Solaris and Linux have it, and it makes
2966 ! our life easier :-) so we'll try it.
2968 ! #ifdef HAS_GETPGID
2969 ! # define BSD_GETPGRP(pid) getpgid((pid))
2971 ! # if defined(HAS_GETPGRP) && defined(USE_BSD_GETPGRP)
2972 ! # define BSD_GETPGRP(pid) getpgrp((pid))
2974 ! # ifdef HAS_GETPGRP2 /* DG/UX */
2975 ! # define BSD_GETPGRP(pid) getpgrp2((pid))
2979 ! #if defined(BSD_GETPGRP) && !defined(HAS_GETPGRP)
2980 ! # define HAS_GETPGRP /* Well, effectively it does . . . */
2983 ! /* These are not exact synonyms, since setpgrp() and getpgrp() may
2984 ! have different behaviors, but perl.h used to define USE_BSDPGRP
2985 ! (prior to 5.003_05) so some extension might depend on it.
2987 ! #if defined(USE_BSD_SETPGRP) || defined(USE_BSD_GETPGRP)
2988 ! # ifndef USE_BSDPGRP
2989 ! # define USE_BSDPGRP
2993 #ifndef _TYPES_ /* If types.h defines this it's easy. */
2998 if ($major < 4 && $^O eq 'hpux'
2999 && extract_from_file('sv.c', qr/i = _filbuf\(/)) {
3000 apply_patch(<<'EOPATCH');
3001 diff --git a/sv.c b/sv.c
3002 index a1f1d60..0a806f1 100644
3005 @@ -2641,7 +2641,7 @@ I32 append;
3007 FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */
3009 - i = _filbuf(fp); /* get more characters */
3010 + i = __filbuf(fp); /* get more characters */
3012 ptr = FILE_ptr(fp); /* reregisterize cnt and ptr */
3018 if ($major == 4 && extract_from_file('scope.c', qr/\(SV\*\)SSPOPINT/)) {
3019 # [PATCH] 5.004_04 +MAINT_TRIAL_1 broken when sizeof(int) != sizeof(void)
3020 # Fixes a bug introduced in 161b7d1635bc830b
3021 apply_commit('9002cb76ec83ef7f');
3024 if ($major == 4 && extract_from_file('av.c', qr/AvARRAY\(av\) = 0;/)) {
3025 # Fixes a bug introduced in 1393e20655efb4bc
3026 apply_commit('e1c148c28bf3335b', 'av.c');
3030 my $rest = extract_from_file('perl.c', qr/delimcpy(.*)/);
3031 if (defined $rest and $rest !~ /,$/) {
3032 # delimcpy added in fc36a67e8855d031, perl.c refactored to use it.
3033 # bug introduced in 2a92aaa05aa1acbf, fixed in 8490252049bf42d3
3034 # code then moved to util.c in commit 491527d0220de34e
3035 apply_patch(<<'EOPATCH');
3036 diff --git a/perl.c b/perl.c
3037 index 4eb69e3..54bbb00 100644
3040 @@ -1735,7 +1735,7 @@ SV *sv;
3041 if (len < sizeof tokenbuf)
3042 tokenbuf[len] = '\0';
3043 #else /* ! (atarist || DOSISH) */
3044 - s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend
3045 + s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend,
3048 #endif /* ! (atarist || DOSISH) */
3053 if ($major == 4 && $^O eq 'linux') {
3054 # Whilst this is fixed properly in f0784f6a4c3e45e1 which provides the
3055 # Configure probe, it's easier to back out the problematic changes made
3056 # in these previous commits.
3058 # In maint-5.004, the simplest addition is to "correct" the file to
3059 # use the same pre-processor macros as blead had used. Whilst commit
3060 # 9b599b2a63d2324d (reverted below) is described as
3061 # [win32] merge change#887 from maintbranch
3062 # it uses __sun__ and __svr4__ instead of the __sun and __SVR4 of the
3063 # maint branch commit 6cdf74fe31f049dc
3065 edit_file('doio.c', sub {
3067 $code =~ s{defined\(__sun\) && defined\(__SVR4\)}
3068 {defined(__sun__) && defined(__svr4__)}g;
3072 if (extract_from_file('doio.c',
3073 qr!^/\* XXX REALLY need metaconfig test \*/$!)) {
3074 revert_commit('4682965a1447ea44', 'doio.c');
3076 if (my $token = extract_from_file('doio.c',
3077 qr!^#if (defined\(__sun(?:__)?\)) && defined\(__svr4__\) /\* XXX Need metaconfig test \*/$!)) {
3078 my $patch = `git show -R 9b599b2a63d2324d doio.c`;
3079 $patch =~ s/defined\(__sun__\)/$token/g;
3080 apply_patch($patch);
3082 if (extract_from_file('doio.c',
3083 qr!^/\* linux \(and Solaris2\?\) uses :$!)) {
3084 revert_commit('8490252049bf42d3', 'doio.c');
3086 if (extract_from_file('doio.c',
3087 qr/^ unsemds.buf = &semds;$/)) {
3088 revert_commit('8e591e46b4c6543e');
3090 if (extract_from_file('doio.c',
3091 qr!^#ifdef __linux__ /\* XXX Need metaconfig test \*/$!)) {
3092 # Reverts part of commit 3e3baf6d63945cb6
3093 apply_patch(<<'EOPATCH');
3094 diff --git b/doio.c a/doio.c
3095 index 62b7de9..0d57425 100644
3098 @@ -1333,9 +1331,6 @@ SV **sp;
3100 I32 id, n, cmd, infosize, getinfo;
3102 -#ifdef __linux__ /* XXX Need metaconfig test */
3103 - union semun unsemds;
3106 id = SvIVx(*++mark);
3107 n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0;
3108 @@ -1364,29 +1359,11 @@ SV **sp;
3109 infosize = sizeof(struct semid_ds);
3110 else if (cmd == GETALL || cmd == SETALL)
3112 -#ifdef __linux__ /* XXX Need metaconfig test */
3114 - int semctl (int semid, int semnun, int cmd, union semun arg)
3118 - struct semid_ds *buf;
3122 - union semun semds;
3123 - if (semctl(id, 0, IPC_STAT, semds) == -1)
3125 struct semid_ds semds;
3126 if (semctl(id, 0, IPC_STAT, &semds) == -1)
3129 getinfo = (cmd == GETALL);
3130 -#ifdef __linux__ /* XXX Need metaconfig test */
3131 - infosize = semds.buf->sem_nsems * sizeof(short);
3133 infosize = semds.sem_nsems * sizeof(short);
3135 /* "short" is technically wrong but much more portable
3136 than guessing about u_?short(_t)? */
3138 @@ -1429,12 +1406,7 @@ SV **sp;
3142 -#ifdef __linux__ /* XXX Need metaconfig test */
3143 - unsemds.buf = (struct semid_ds *)a;
3144 - ret = semctl(id, n, cmd, unsemds);
3146 ret = semctl(id, n, cmd, (struct semid_ds *)a);
3153 # Incorrect prototype added as part of 8ac853655d9b7447, fixed as part
3154 # of commit dc45a647708b6c54, with at least one intermediate
3155 # modification. Correct prototype for gethostbyaddr has socklen_t
3156 # second. Linux has uint32_t first for getnetbyaddr.
3157 # Easiest just to remove, instead of attempting more complex patching.
3158 # Something similar may be needed on other platforms.
3159 edit_file('pp_sys.c', sub {
3161 $code =~ s/^ struct hostent \*(?:PerlSock_)?gethostbyaddr\([^)]+\);$//m;
3162 $code =~ s/^ struct netent \*getnetbyaddr\([^)]+\);$//m;
3167 if ($major < 5 && $^O eq 'aix'
3168 && !extract_from_file('pp_sys.c',
3169 qr/defined\(HOST_NOT_FOUND\) && !defined\(h_errno\)/)) {
3170 # part of commit dc45a647708b6c54
3171 # Andy Dougherty's configuration patches (Config_63-01 up to 04).
3172 apply_patch(<<'EOPATCH')
3173 diff --git a/pp_sys.c b/pp_sys.c
3174 index c2fcb6f..efa39fb 100644
3177 @@ -54,7 +54,7 @@ extern "C" int syscall(unsigned long,...);
3181 -#ifdef HOST_NOT_FOUND
3182 +#if defined(HOST_NOT_FOUND) && !defined(h_errno)
3190 && `git rev-parse HEAD` eq "22c35a8c2392967a5ba6b5370695be464bd7012c\n") {
3191 # Commit 22c35a8c2392967a is significant,
3192 # "phase 1 of somewhat major rearrangement of PERL_OBJECT stuff"
3193 # but doesn't build due to 2 simple errors. blead in this broken state
3194 # was merged to the cfgperl branch, and then these were immediately
3195 # corrected there. cfgperl (with the fixes) was merged back to blead.
3196 # The resultant rather twisty maze of commits looks like this:
3200 * | | commit 137225782c183172f360c827424b9b9f8adbef0e
3201 |\ \ \ Merge: 22c35a8 2a8ee23
3202 | |/ / Author: Gurusamy Sarathy <gsar@cpan.org>
3203 | | | Date: Fri Oct 30 17:38:36 1998 +0000
3205 | | | integrate cfgperl tweaks into mainline
3207 | | | p4raw-id: //depot/perl@2144
3209 | * | commit 2a8ee23279873759693fa83eca279355db2b665c
3210 | | | Author: Jarkko Hietaniemi <jhi@iki.fi>
3211 | | | Date: Fri Oct 30 13:27:39 1998 +0000
3213 | | | There can be multiple yacc/bison errors.
3215 | | | p4raw-id: //depot/cfgperl@2143
3217 | * | commit 93fb2ac393172fc3e2c14edb20b718309198abbc
3218 | | | Author: Jarkko Hietaniemi <jhi@iki.fi>
3219 | | | Date: Fri Oct 30 13:18:43 1998 +0000
3221 | | | README.posix-bc update.
3223 | | | p4raw-id: //depot/cfgperl@2142
3225 | * | commit 4ec43091e8e6657cb260b5e563df30aaa154effe
3226 | | | Author: Jarkko Hietaniemi <jhi@iki.fi>
3227 | | | Date: Fri Oct 30 09:12:59 1998 +0000
3229 | | | #2133 fallout.
3231 | | | p4raw-id: //depot/cfgperl@2141
3233 | * | commit 134ca994cfefe0f613d43505a885e4fc2100b05c
3234 | |\ \ Merge: 7093112 22c35a8
3235 | |/ / Author: Jarkko Hietaniemi <jhi@iki.fi>
3236 |/| | Date: Fri Oct 30 08:43:18 1998 +0000
3238 | | | Integrate from mainperl.
3240 | | | p4raw-id: //depot/cfgperl@2140
3242 * | | commit 22c35a8c2392967a5ba6b5370695be464bd7012c
3243 | | | Author: Gurusamy Sarathy <gsar@cpan.org>
3244 | | | Date: Fri Oct 30 02:51:39 1998 +0000
3246 | | | phase 1 of somewhat major rearrangement of PERL_OBJECT stuff
3247 | | | (objpp.h is gone, embed.pl now does some of that); objXSUB.h
3248 | | | should soon be automated also; the global variables that
3249 | | | escaped the PL_foo conversion are now reined in; renamed
3250 | | | MAGIC in regcomp.h to REG_MAGIC to avoid collision with the
3251 | | | type of same name; duplicated lists of pp_things in various
3252 | | | places is now gone; result has only been tested on win32
3254 | | | p4raw-id: //depot/perl@2133
3260 # and completely confuses git bisect (and at least me), causing it to
3261 # the bisect run to confidently return the wrong answer, an unrelated
3262 # commit on the cfgperl branch.
3264 apply_commit('4ec43091e8e6657c');
3268 && extract_from_file('pp_sys.c', qr/PERL_EFF_ACCESS_R_OK/)
3269 && !extract_from_file('pp_sys.c', qr/XXX Configure test needed for eaccess/)) {
3270 # Between 5ff3f7a4e03a6b10 and c955f1177b2e311d^
3271 # This is the meat of commit c955f1177b2e311d (without the other
3272 # indenting changes that would cause a conflict).
3273 # Without this 538 revisions won't build on (at least) Linux
3274 apply_patch(<<'EOPATCH');
3275 diff --git a/pp_sys.c b/pp_sys.c
3276 index d60c8dc..867dee4 100644
3279 @@ -198,9 +198,18 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true";
3280 # if defined(I_SYS_SECURITY)
3281 # include <sys/security.h>
3283 -# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
3284 -# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
3285 -# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
3286 + /* XXX Configure test needed for eaccess */
3288 + /* HP SecureWare */
3289 +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
3290 +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
3291 +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
3294 +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK))
3295 +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK))
3296 +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK))
3300 #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF)
3305 && extract_from_file('mg.c', qr/If we're still on top of the stack, pop us off/)
3306 && !extract_from_file('mg.c', qr/PL_savestack_ix -= popval/)) {
3307 # Fix up commit 455ece5e082708b1:
3308 # SSNEW() API for allocating memory on the savestack
3309 # Message-Id: <tqemtae338.fsf@puma.genscan.com>
3310 # Subject: [PATCH 5.005_51] (was: why SAVEDESTRUCTOR()...)
3311 apply_commit('3c8a44569607336e', 'mg.c');
3315 if (extract_from_file('doop.c', qr/croak\(no_modify\);/)
3316 && extract_from_file('doop.c', qr/croak\(PL_no_modify\);/)) {
3317 # Whilst the log suggests that this would only fix 5 commits, in
3318 # practice this area of history is a complete tarpit, and git bisect
3319 # gets very confused by the skips in the middle of the back and
3320 # forth merging between //depot/perl and //depot/cfgperl
3321 apply_commit('6393042b638dafd3');
3324 # One error "fixed" with another:
3325 if (extract_from_file('pp_ctl.c',
3326 qr/\Qstatic void *docatch_body _((void *o));\E/)) {
3327 apply_commit('5b51e982882955fe');
3329 # Which is then fixed by this:
3330 if (extract_from_file('pp_ctl.c',
3331 qr/\Qstatic void *docatch_body _((valist\E/)) {
3332 apply_commit('47aa779ee4c1a50e');
3335 if (extract_from_file('thrdvar.h', qr/PERLVARI\(Tprotect/)
3336 && !extract_from_file('embedvar.h', qr/PL_protect/)) {
3337 # Commit 312caa8e97f1c7ee didn't update embedvar.h
3338 apply_commit('e0284a306d2de082', 'embedvar.h');
3343 && extract_from_file('sv.c',
3344 qr/PerlDir_close\(IoDIRP\((?:\(IO\*\))?sv\)\);/)
3345 && !(extract_from_file('toke.c',
3346 qr/\QIoDIRP(FILTER_DATA(AvFILLp(PL_rsfp_filters))) = NULL\E/)
3347 || extract_from_file('toke.c',
3348 qr/\QIoDIRP(datasv) = (DIR*)NULL;\E/))) {
3349 # Commit 93578b34124e8a3b, //depot/perl@3298
3350 # close directory handles properly when localized,
3351 # tweaked slightly by commit 1236053a2c722e2b,
3352 # add test case for change#3298
3354 # The fix is the last part of:
3356 # various fixes for clean build and test on win32; configpm broken,
3357 # needed to open myconfig.SH rather than myconfig; sundry adjustments
3358 # to bytecode stuff; tweaks to DYNAMIC_ENV_FETCH code to make it
3359 # work under win32; getenv_sv() changed to getenv_len() since SVs
3360 # aren't visible in the lower echelons; remove bogus exports from
3361 # config.sym; PERL_OBJECT-ness for C++ exception support; null out
3362 # IoDIRP in filter_del() or sv_free() will attempt to close it
3364 # The changed code is modified subsequently by commit e0c198038146b7a4
3365 apply_commit('a6c403648ecd5cc7', 'toke.c');
3368 if ($major < 6 && $^O eq 'netbsd'
3369 && !extract_from_file('unixish.h',
3370 qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) {
3371 apply_patch(<<'EOPATCH')
3372 diff --git a/unixish.h b/unixish.h
3373 index 2a6cbcd..eab2de1 100644
3378 /* #define ALTERNATE_SHEBANG "#!" / **/
3380 -#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
3381 +#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__)
3382 # include <signal.h>
3388 if ($major == 7 && $^O eq 'aix' &&
3389 extract_from_file('ext/List/Util/Util.xs', qr/PUSHBLOCK/)
3390 && !extract_from_file('makedef.pl', qr/^Perl_cxinc/)) {
3391 # Need this to get List::Utils 1.03 and later to compile.
3392 # 1.03 also expects to call Perl_pp_rand. Commit d3632a54487acc5f
3393 # fixes this (for the unthreaded case), but it's not until 1.05,
3394 # two days later, that this is fixed properly.
3395 apply_commit('cbb96eed3f175499');
3398 if (($major >= 7 || $major <= 9) && $^O eq 'openbsd'
3399 && `uname -m` eq "sparc64\n"
3400 # added in 2000 by commit cb434fcc98ac25f5:
3401 && extract_from_file('regexec.c',
3402 qr!/\* No need to save/restore up to this paren \*/!)
3403 # re-indented in 2006 by commit 95b2444054382532:
3404 && extract_from_file('regexec.c', qr/^\t\tCURCUR cc;$/)) {
3405 # Need to work around a bug in (at least) OpenBSD's 4.6's sparc64 #
3406 # compiler ["gcc (GCC) 3.3.5 (propolice)"]. Between commits
3407 # 3ec562b0bffb8b8b (2002) and 1a4fad37125bac3e^ (2005) the darling thing
3408 # fails to compile any code for the statement cc.oldcc = PL_regcc;
3410 # If you refactor the code to "fix" that, or force the issue using set
3411 # in the debugger, the stack smashing detection code fires on return
3412 # from S_regmatch(). Turns out that the compiler doesn't allocate any
3413 # (or at least enough) space for cc.
3415 # Restore the "uninitialised" value for cc before function exit, and the
3416 # stack smashing code is placated. "Fix" 3ec562b0bffb8b8b (which
3417 # changes the size of auto variables used elsewhere in S_regmatch), and
3418 # the crash is visible back to bc517b45fdfb539b (which also changes
3419 # buffer sizes). "Unfix" 1a4fad37125bac3e and the crash is visible until
3420 # 5b47454deb66294b. Problem goes away if you compile with -O, or hack
3421 # the code as below.
3423 # Hence this turns out to be a bug in (old) gcc. Not a security bug we
3424 # still need to fix.
3425 apply_patch(<<'EOPATCH');
3426 diff --git a/regexec.c b/regexec.c
3427 index 900b491..6251a0b 100644
3430 @@ -2958,7 +2958,11 @@ S_regmatch(pTHX_ regnode *prog)
3432 *******************************************************************/
3437 + char hack_buff[sizeof(CURCUR) + 1];
3439 +#define cc hack.hack_cc
3440 CHECKPOINT cp = PL_savestack_ix;
3441 /* No need to save/restore up to this paren */
3442 I32 parenfloor = scan->flags;
3443 @@ -2983,6 +2987,7 @@ S_regmatch(pTHX_ regnode *prog)
3444 n = regmatch(PREVOPER(next)); /* start on the WHILEM */
3446 PL_regcc = cc.oldcc;
3454 if ($major < 8 && $^O eq 'openbsd'
3455 && !extract_from_file('perl.h', qr/include <unistd\.h>/)) {
3456 # This is part of commit 3f270f98f9305540, applied at a slightly
3457 # different location in perl.h, where the context is stable back to
3459 apply_patch(<<'EOPATCH');
3460 diff --git a/perl.h b/perl.h
3461 index 9418b52..b8b1a7c 100644
3464 @@ -496,6 +496,10 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
3465 # include <sys/param.h>
3468 +/* If this causes problems, set i_unistd=undef in the hint file. */
3470 +# include <unistd.h>
3473 /* Use all the "standard" definitions? */
3474 #if defined(STANDARD_C) && defined(I_STDLIB)
3480 if (-f 'ext/POSIX/Makefile.PL'
3481 && extract_from_file('ext/POSIX/Makefile.PL',
3482 qr/Explicitly avoid including/)) {
3483 # commit 6695a346c41138df, which effectively reverts 170888cff5e2ffb7
3485 # PERL5LIB is populated by make_ext.pl with paths to the modules we need
3486 # to run, don't override this with "../../lib" since that may not have
3487 # been populated yet in a parallel build.
3488 apply_commit('6695a346c41138df');
3491 if (-f 'ext/Hash/Util/Makefile.PL'
3492 && extract_from_file('ext/Hash/Util/Makefile.PL',
3493 qr/\bDIR\b.*'FieldHash'/)) {
3494 # ext/Hash/Util/Makefile.PL should not recurse to FieldHash's Makefile.PL
3495 # *nix, VMS and Win32 all know how to (and have to) call the latter directly.
3496 # As is, targets in ext/Hash/Util/FieldHash get called twice, which may result
3497 # in race conditions, and certainly messes up make clean; make distclean;
3498 apply_commit('550428fe486b1888');
3501 if ($major < 8 && $^O eq 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') {
3502 checkout_file('ext/DynaLoader/dl_dyld.xs', 'f556e5b971932902');
3503 apply_patch(<<'EOPATCH');
3504 diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
3505 --- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:41:27.000000000 +0100
3506 +++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 21:42:20.000000000 +0100
3520 +# define dTHXa(a) extern int Perl___notused(void)
3521 +# define dTHX extern int Perl___notused(void)
3524 +#ifndef Perl_form_nocontext
3525 +# define Perl_form_nocontext form
3528 +#ifndef Perl_warn_nocontext
3529 +# define Perl_warn_nocontext warn
3533 +# define PTR2IV(p) (IV)(p)
3537 +# define get_av perl_get_av
3540 #define DL_LOADONCEONLY
3542 #include "dlutils.c" /* SaveError() etc */
3545 DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags));
3547 - Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename);
3548 + Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename);
3549 RETVAL = dlopen(filename, mode) ;
3550 DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL));
3551 ST(0) = sv_newmortal() ;
3553 if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) {
3554 apply_patch(<<'EOPATCH');
3555 diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
3556 --- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100
3557 +++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100
3559 # define get_av perl_get_av
3563 +form(char *pat, ...)
3567 + va_start(args, pat);
3568 + vasprintf(&retval, pat, &args);
3570 + SAVEFREEPV(retval);
3574 #define DL_LOADONCEONLY
3576 #include "dlutils.c" /* SaveError() etc */
3582 if ($unfixable_db_file) {
3583 # Nothing we can do.
3584 } elsif (!extract_from_file('ext/DB_File/DB_File.xs',
3585 qr/^#ifdef AT_LEAST_DB_4_1$/)) {
3586 # This line is changed by commit 3245f0580c13b3ab
3587 my $line = extract_from_file('ext/DB_File/DB_File.xs',
3588 qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/);
3589 apply_patch(<<"EOPATCH");
3590 diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
3591 index 489ba96..fba8ded 100644
3592 --- a/ext/DB_File/DB_File.xs
3593 +++ b/ext/DB_File/DB_File.xs
3594 \@\@ -183,4 +187,8 \@\@
3597 +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
3598 +# define AT_LEAST_DB_4_1
3601 /* map version 2 features & constants onto their version 1 equivalent */
3603 \@\@ -1334,7 +1419,12 \@\@ SV * sv ;
3606 +#ifdef AT_LEAST_DB_4_1
3607 + status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL, RETVAL->type,
3613 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */
3619 if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') {
3620 edit_file('ext/IPC/SysV/SysV.xs', sub {
3622 my $fixed = <<'EOFIX';
3624 #include <sys/types.h>
3625 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
3627 # include <sys/ipc.h>
3630 # include <sys/msg.h>
3633 # if defined(PERL_SCO) || defined(PERL_ISC)
3634 # include <sys/sysmacros.h> /* SHMLBA */
3636 # include <sys/shm.h>
3637 # ifndef HAS_SHMAT_PROTOTYPE
3638 extern Shmat_t shmat (int, char *, int);
3640 # if defined(HAS_SYSCONF) && defined(_SC_PAGESIZE)
3641 # undef SHMLBA /* not static: determined at boot time */
3642 # define SHMLBA sysconf(_SC_PAGESIZE)
3643 # elif defined(HAS_GETPAGESIZE)
3644 # undef SHMLBA /* not static: determined at boot time */
3645 # define SHMLBA getpagesize()
3651 #include <sys/types\.h>
3653 (#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms;
3661 return unless $fixups;
3662 foreach my $file (@$fixups) {
3663 my $fh = open_or_die($file);
3666 if ($line =~ /^#!perl\b/) {
3668 and die_255("$^X $file failed: \$!=$!, \$?=$?");
3669 } elsif ($line =~ /^#!(\/\S+)/) {
3671 and die_255("$file failed: \$!=$!, \$?=$?");
3673 if (my ($target, $action, $pattern)
3674 = $line =~ m#^(\S+) ([=!])~ /(.*)/#) {
3675 if (length $pattern) {
3676 next unless -f $target;
3677 if ($action eq '=') {
3678 next unless extract_from_file($target, $pattern);
3680 next if extract_from_file($target, $pattern);
3683 # Avoid the special case meaning of the empty pattern,
3684 # and instead use this to simply test for the file being
3686 if ($action eq '=') {
3687 next unless -f $target;
3693 system_or_die("patch -p1 <$file");
3698 # ex: set ts=8 sts=4 sw=4 et: