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)
59 'target=s', 'make=s', 'jobs|j=i', 'crash', 'expect-pass=i',
60 'expect-fail' => sub { $options{'expect-pass'} = 0; },
61 'clean!', 'one-liner|e=s@', 'c', 'l', 'w', 'match=s',
63 $options{match} = $_[1];
64 $options{'expect-pass'} = 0;
66 'force-manifest', 'force-regen', 'setpgrp!', 'timeout=i',
67 'test-build', 'validate',
68 'all-fixups', 'early-fixup=s@', 'late-fixup=s@', 'valgrind',
69 'check-args', 'check-shebang!', 'usage|help|?', 'gold=s',
70 'module=s', 'with-module=s', 'cpan-config-dir=s',
71 'test-module=s', 'no-module-tests',
74 my (undef, $val) = @_;
75 if ($val =~ /\A([^=]+)=(.*)/s) {
76 $defines{$1} = length $2 ? $2 : "\0";
82 $defines{$_[1]} = undef;
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>. The C<-D>, C<-A> and
444 C<-U> switches should be spelled as if you were normally giving them to
445 F<./Configure>. For example,
447 -Dnoextensions=Encode
449 -Accflags=-DNO_MATHOMS
451 Repeated C<-A> arguments are passed
452 through as is. C<-D> and C<-U> are processed in order, and override
453 previous settings for the same parameter. F<bisect-runner.pl> emulates
454 C<-Dnoextensions> when F<Configure> itself does not provide it, as it's
455 often very useful to be able to disable some XS extensions.
461 The C<make> command to use. If this not set, F<make> is used. If this is
462 set, it also adds a C<-Dmake=...> else some recursive make invocations
463 in extensions may fail. Typically one would use this as C<--make gmake>
464 to use F<gmake> in place of the system F<make>.
474 Number of C<make> jobs to run in parallel. A value of 0 suppresses
475 parallelism. If F</proc/cpuinfo> exists and can be parsed, or F</sbin/sysctl>
476 exists and reports C<hw.ncpu>, or F</usr/bin/getconf> exists and reports
477 C<_NPROCESSORS_ONLN> defaults to 1 + I<number of CPUs>. On HP-UX with the
478 system make defaults to 0, otherwise defaults to 2.
488 Instead of running a test program to determine I<pass> or I<fail>,
489 C<--match> will pass if the given regex matches, and hence search for the
490 commit that removes the last matching file. C<--no-match> inverts the test,
491 to search for the first commit that adds files that match.
493 The remaining command line arguments are treated as glob patterns for files
494 to match against. If none are specified, then they default as follows:
500 If no I<target> is specified, the match is against all files in the
501 repository (which is fast).
505 If a I<target> is specified, that target is built, and the match is against
506 only the built files.
510 Treating the command line arguments as glob patterns should not cause
511 problems, as the perl distribution has never shipped or built files with
512 names that contain characters which are globbing metacharacters.
514 Anything which is not a readable file is ignored, instead of generating an
515 error. (If you want an error, run C<grep> or C<ack> as a test case). This
516 permits one to easily search in a file that changed its name. For example:
518 .../Porting/bisect.pl --match 'Pod.*Functions' 'pod/buildtoc*'
520 C<--no-match ...> is implemented as C<--expect-fail --match ...>
526 Run the test program under C<valgrind>. If you need to test for memory
527 errors when parsing invalid programs, the default parser fail exit code of
528 255 will always override C<valgrind>, so try putting the test case invalid
529 code inside a I<string> C<eval>, so that the perl interpreter will exit with 0.
530 (Be sure to check the output of $@, to avoid missing mistakes such as
531 unintended C<eval> failures due to incorrect C<@INC>)
533 Specifically, this option prepends C<valgrind> C<--error-exitcode=124> to
534 the command line that runs the testcase, to cause valgrind to exit non-zero
535 if it detects errors, with the assumption that the test program itself
536 always exits with zero. If you require more flexibility than this, either
537 specify your C<valgrind> invocation explicitly as part of the test case, or
538 use a wrapper script to control the command line or massage the exit codes.
540 In order for the test program to be seen as a perl script to valgrind
541 (rather than a shell script), the first line must be one of the following
550 Test that the build completes, without running any test case.
552 By default, if the build for the desired I<target> fails to complete,
553 F<bisect-runner.pl> reports a I<skip> back to C<git bisect>, the assumption
554 being that one wants to find a commit which changed state "builds && passes"
555 to "builds && fails". If instead one is interested in which commit broke the
556 build (possibly for particular F<Configure> options), use I<--test-build>
557 to treat a build failure as a failure, not a "skip".
559 Often this option isn't as useful as it first seems, because I<any> build
560 failure will be reported to C<git bisect> as a failure, not just the failure
561 that you're interested in. Generally, to debug a particular problem, it's
562 more useful to use a I<target> that builds properly at the point of interest,
563 and then a test case that runs C<make>. For example:
565 .../Porting/bisect.pl --start=perl-5.000 --end=perl-5.002 \
566 --expect-fail --force-manifest --target=miniperl make perl
568 will find the first revision capable of building L<DynaLoader> and then
569 F<perl>, without becoming confused by revisions where F<miniperl> won't
574 --module module1,module2,...
576 Install this (or these) module(s), die when it (the last of those)
577 cannot be updated to the current version.
579 Misnomer. the argument can be any argument that can be passed to CPAN
580 shell's install command. B<But>: since we only have the uptodate
581 command to verify that an install has taken place, we are unable to
582 determine success for arguments like
583 MSCHWERN/Test-Simple-1.005000_005.tar.gz.
585 In so far, it is not such a misnomer.
587 Note that this and I<--with-module> will both require a C<CPAN::MyConfig>.
588 If F<$ENV{HOME}/.cpan/CPAN/MyConfig.pm> does not exist, a CPAN shell will
589 be started up for you so you can configure one. Feel free to let
590 CPAN pick defaults for you. Enter 'quit' when you are done, and
591 then everything should be all set. Alternatively, you may
592 specify a custom C<CPAN::MyConfig> by using I<--cpan-config-dir>.
594 Also, if you want to bisect a module that needs a display (like
595 TK) and you don't want random screens appearing and disappearing
596 on your computer while you're working, you can do something like
601 $ while true; do date ; if ! ps auxww | grep -v grep \
602 | grep -q Xvfb; then Xvfb :121 & fi; echo -n 'sleeping 60 '; \
607 DISPLAY=":121" .../Porting/bisect.pl --module=TK
609 (Some display alternatives are vncserver and Xnest.)
613 --with-module module1,module2,...
615 Like I<--module> above, except this simply installs the requested
616 modules and they can then be used in other tests.
620 .../Porting/bisect.pl --with-module=Moose -e 'use Moose; ...'
626 Use in conjunction with I<--with-module> to install the modules without
627 running their tests. This can be a big time saver.
631 .../Porting/bisect.pl --with-module=Moose --no-module-tests \
638 This is like I<--module>, but just runs the module's tests, instead of
641 WARNING: This is a somewhat experimental option, known to work on recent
642 CPAN shell versions. If you use this option and strange things happen,
645 Usually, you can just use I<--module>, but if you are getting inconsistent
646 installation failures and you just want to see when the tests started
647 failing, you might find this option useful.
651 --cpan-config-dir /home/blah/custom
653 If defined, this will cause L<CPAN> to look for F<CPAN/MyConfig.pm> inside of
654 the specified directory, instead of using the default config of
655 F<$ENV{HOME}/.cpan/>.
657 If no default config exists, a L<CPAN> shell will be fired up for you to
658 configure things. Letting L<CPAN> automatically configure things for you
659 should work well enough. You probably want to choose I<manual> instead of
660 I<local::lib> if it asks. When you're finished with configuration, just
661 type I<q> and hit I<ENTER> and the bisect should continue.
667 By default, a build will "skip" if any files listed in F<MANIFEST> are not
668 present. Usually this is useful, as it avoids false-failures. However, there
669 are some long ranges of commits where listed files are missing, which can
670 cause a bisect to abort because all that remain are skipped revisions.
672 In these cases, particularly if the test case uses F<miniperl> and no modules,
673 it may be more useful to force the build to continue, even if files
674 F<MANIFEST> are missing.
680 Run C<make regen_headers> before building F<miniperl>. This may fix a build
681 that otherwise would skip because the generated headers at that revision
682 are stale. It's not the default because it conceals this error in the true
683 state of such revisions.
689 C<--expect-pass=0> is equivalent to C<--expect-fail>. I<1> is the default.
695 Run the testcase with the given timeout. If this is exceeded, kill it (and
696 by default all its children), and treat it as a failure.
702 Run the testcase in its own process group. Specifically, call C<setpgrp 0, 0>
703 just before C<exec>-ing the user testcase. The default is not to set the
704 process group, unless a timeout is used.
710 F<bisect-runner.pl> will minimally patch various files on a platform and
711 version dependent basis to get the build to complete. Normally it defers
712 doing this as long as possible - C<.SH> files aren't patched until after
713 F<Configure> is run, and C<C> and C<XS> code isn't patched until after
714 F<miniperl> is built. If C<--all-fixups> is specified, all the fixups are
715 done before running C<Configure>. In rare cases adding this may cause a
716 bisect to abort, because an inapplicable patch or other fixup is attempted
717 for a revision which would usually have already I<skip>ped. If this happens,
718 please report it as a bug, giving the OS and problem revision.
728 Specify a file containing a patch or other fixup for the source code. The
729 action to take depends on the first line of the fixup file
737 If the first line starts C<#!perl> then the file is run using C<$^X>
743 If a shebang line is present the file is executed using C<system>
747 C<I<filename> =~ /I<pattern>/>
751 C<I<filename> !~ /I<pattern>/>
753 If I<filename> does not exist then the fixup file's contents are ignored.
754 Otherwise, for C<=~>, if it contains a line matching I<pattern>, then the
755 file is fed to C<patch -p1> on standard input. For C<=~>, the patch is
756 applied if no lines match the pattern.
758 As the empty pattern in Perl is a special case (it matches the most recent
759 successful match) which is not useful here, the treatment of an empty pattern
760 is special-cased. C<I<filename> =~ //> applies the patch if filename is
761 present. C<I<filename> !~ //> applies the patch if filename missing. This
762 makes it easy to unconditionally apply patches to files, and to use a patch
763 as a way of creating a new file.
767 Otherwise, the file is assumed to be a patch, and always applied.
771 I<early-fixup>s are applied before F<./Configure> is run. I<late-fixup>s are
772 applied just after F<./Configure> is run.
774 These options can be specified more than once. I<file> is actually expanded
775 as a glob pattern. Globs that do not match are errors, as are missing files.
781 Tell F<bisect-runner.pl> not to clean up after the build. This allows one
782 to use F<bisect-runner.pl> to build the current particular perl revision for
783 interactive testing, or for debugging F<bisect-runner.pl>.
785 Passing this to F<bisect.pl> will likely cause the bisect to fail badly.
791 Test that all stable (.0) revisions can be built. By default, attempts to
792 build I<blead>, then tagged stable releases in reverse order down to
793 I<perl-5.002> (or I<perl5.005> on a case insensitive file system). Stops at
794 the first failure, without cleaning the checkout. Use I<--start> to specify
795 the earliest revision to test, I<--end> to specify the most recent. Useful
796 for validating a new OS/CPU/compiler combination. For example
798 ../perl/Porting/bisect.pl --validate -le 'print "Hello from $]"'
800 If no testcase is specified, the default is to use F<t/TEST> to run
807 Validate the options and arguments, and exit silently if they are valid.
813 Validate that the test case isn't an executable file with a
814 C<#!/usr/bin/perl> line (or similar). As F<bisect-runner.pl> does B<not>
815 automatically prepend C<./perl> to the test case, a I<#!> line specifying an
816 external F<perl> binary will cause the test case to always run with I<that>
817 F<perl>, not the F<perl> built by the bisect runner. Likely this is not what
818 you wanted. If your test case is actually a wrapper script to run other
819 commands, you should run it with an explicit interpreter, to be clear. For
820 example, instead of C<../perl/Porting/bisect.pl ~/test/testcase.pl> you'd
821 run C<../perl/Porting/bisect.pl /usr/bin/perl ~/test/testcase.pl>
827 Revision to use when checking out known-good recent versions of files,
828 such as F<hints/freebsd.sh>. F<bisect-runner.pl> defaults this to I<blead>,
829 but F<bisect.pl> will default it to the most recent stable release.
843 Display the usage information and exit.
849 =head2 Code has started to crash under C<miniperl>
855 Under C<make minitest> (but not under C<make test_harness>), F<t/re/pat.t> was
856 failing to compile. What was the first commit at which that compilation
857 failure could be observed?
861 Extract code from the test file at the point where C<./miniperl -Ilib -c> was
862 showing a compilation failure. Use that in bisection with the C<miniperl>
865 .../Porting/bisect.pl --target=miniperl --start=2ec4590e \
866 -e 'q|ace| =~ /c(?=.$)/; $#{^CAPTURE} == -1); exit 0;'
870 L<GH issue 17293|https://github.com/Perl/perl5/issues/17293>
874 =head2 Blead breaks CPAN on threaded builds only
880 Tests in CPAN module XML::Parser's test suite had begun to fail when tested
881 against blead in threaded builds only.
885 Provide F<Configure>-style switch to bisection program. Straightforward use
886 of the C<--module> switch.
888 .../Porting/bisect.pl -Duseithreads \
895 L<GH issue 16918|https://github.com/Perl/perl5/issues/16918>
899 =head2 Point in time where code started to segfault is unknown
905 User submitted code sample which when run caused F<perl> to segfault, but did
906 not claim that this was a recent change.
910 Used locally installed production releases of perl (previously created by
911 F<perlbrew>) to identify the first production release at which the code would
912 not compile. Used that information to shorten bisection time.
914 .../perl Porting/bisect.pl \
917 --crash -- ./perl -Ilib /tmp/gh-17333-map.pl
919 $ cat gh-17333-map.pl
926 L<GH issue 17333|https://github.com/Perl/perl5/issues/17333>
930 =head2 Interaction of debug flags caused crash on C<-DDEBUGGING> builds
936 In C<-DDEBUGGING> builds, the debug flags C<Xvt> would crash a program when
937 F<strict.pm> was loaded via C<require> or C<use>.
941 Two-stage solution. In each stage, to shorten debugging time investigator
942 made use of existing set of production releases of F<perl> built with
949 Investigator used existing C<-DDEBUGGING> builds to determine the production
950 cycle in which crash first appeared. Then:
952 .../perl/Porting/bisect.pl \
958 -- ./miniperl -Ilib -DXvt -Mstrict -e 1
960 First bad commit was identified as
961 L<ed958fa315|https://github.com/Perl/perl5/commit/ed958fa315>.
965 A second investigator was able to create a reduction of the code needed to
966 trigger a crash, then used this reduced case and the commit reported at the
967 end of Stage 1 to further bisect.
969 .../perl/Porting/bisect.pl \
975 -- ./miniperl -Ilib -DXv -e '{ my $n=1; *foo= sub () { $n }; }'
979 The first bisect determined the point at which code was introduced to
980 F<strict.pm> that triggered the problem. With an understanding of the trigger,
981 the second bisect then determined the point at which such a trigger started
986 L<GH issue 193463|https://github.com/Perl/perl5/issues/19463>
990 =head2 When did perl start failing to build on a certain platform using C<g++> as the C-compiler?
996 On NetBSD-8.0, C<perl> had never been smoke-tested using C<g++> as the
997 C-compiler. Once this was done, it became evident that changes in that
998 version of the operating system's code were incompatible with some C<perl>
999 source written long before that OS version was ever released!
1003 Bisection range was first narrowed using existing builds at release tags.
1004 Then, bisection specified the C-compiler via C<Configure>-style switch and
1005 used C<--test-build> to identify the commit which "broke" the build.
1007 .../perl Porting/bisect.pl \
1013 Then, problem was discussed with knowledgeable NetBSD user.
1017 L<GH issue 17381|https://github.com/Perl/perl5/issues/17381>
1021 =head2 When did a test file start to emit warnings?
1027 When F<dist/Tie-File/t/43_synopsis> was run as part of C<make test>, we
1028 observed warnings not previously seen. At what commit were those warnings
1033 We know that when this test file was first committed to blead, no warnings
1034 were observed and there was no output to C<STDERR>. So that commit becomes
1035 the value for C<--start>.
1037 Since the test file in question is for a CPAN distribution maintained by core,
1038 we must prepare to run that test by including C<--target=test_prep> in the
1039 bisection invocation. We then run the test file in a way that captures
1040 C<STDERR> in a file. If that file has non-zero size, then we have presumably
1041 captured the newly seen warnings.
1043 export ERR="/tmp/err"
1045 .../perl Porting/bisect.pl \
1046 --start=507614678018ae1abd55a22e9941778c65741ba3 \
1047 --end=d34b46d077dcfc479c36f65b196086abd7941c76 \
1048 --target=test_prep \
1051 "./perl harness ../dist/Tie-File/t/43_synopsis.t
1054 -s $ENV{ERR} and die "See $ENV{ERR} for warnings thrown";'
1056 Bisection pointed to a commit where strictures and warnings were first turned
1057 on throughout the F<dist/Tie-File/> directory.
1061 L<Commit 125e1a3|https://github.com/Perl/perl5/commit/125e1a36a939>
1065 =head2 When did perl stop segfaulting on certain code?
1071 It was reported that perl was segfaulting on this code in perl-5.36.0:
1073 @a = sort{eval"("}1,2
1075 Bisection subsequently identified the commit at which the segfaulting first
1076 appeared. But when we ran that code against what was then the HEAD of blead
1077 (L<Commit 70d911|https://github.com/Perl/perl5/commit/70d911984f>), we got no
1078 segfault. So the next question we faced was: At what commit did the
1083 Because the code in question loaded no libraries, it was amenable to bisection
1084 with C<miniperl>, thereby shortening bisection time considerably.
1086 perl Porting/bisect.pl \
1089 --expect-fail -e '@a = sort{eval"("}1,2'
1093 L<GH issue 20261|https://github.com/Perl/perl5/issues/20261>
1099 # Ensure we always exit with 255, to cause git bisect to abort.
1101 my $message = join '', @_;
1102 if ($message =~ /\n\z/) {
1103 print STDERR $message;
1105 my (undef, $file, $line) = caller 1;
1106 print STDERR "@_ at $file line $line\n";
1115 die_255("$0: Can't build $target")
1116 if defined $target && !grep {@targets} $target;
1118 foreach my $phase (qw(early late)) {
1119 next unless $options{"$phase-fixup"};
1123 foreach my $glob (@{$options{"$phase-fixup"}}) {
1124 my @got = File::Glob::bsd_glob($glob);
1125 push @expanded, @got ? @got : $glob;
1127 @expanded = sort @expanded;
1128 $options{"$phase-fixup"} = \@expanded;
1129 foreach (@expanded) {
1131 print STDERR "$phase-fixup '$_' is not a readable file\n";
1135 exit 255 if $bail_out;
1138 unless (exists $defines{cc}) {
1139 # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
1141 # FIXME - really it should be replaced with a proper test of
1142 # "can we build something?" and a helpful diagnostic if we can't.
1143 # For now, simply move it here.
1144 $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
1147 my $j = $options{jobs} ? "-j$options{jobs}" : '';
1149 if (exists $options{make}) {
1150 if (!exists $defines{make}) {
1151 $defines{make} = $options{make};
1154 $options{make} = 'make';
1157 # Sadly, however hard we try, I don't think that it will be possible to build
1158 # modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
1159 # which updated to MakeMaker 3.7, which changed from using a hard coded ld
1160 # in the Makefile to $(LD). On x86_64 Linux the "linker" is gcc.
1164 my $mode = @_ ? shift : '<';
1165 open my $fh, $mode, $file or croak_255("Can't open $file: $!");
1166 ${*$fh{SCALAR}} = $file;
1172 return if close $fh;
1173 croak_255("Can't close: $!") unless ref $fh eq 'GLOB';
1174 croak_255("Can't close ${*$fh{SCALAR}}: $!");
1178 my $command = '</dev/null ' . shift;
1179 system($command) and croak_255("'$command' failed, \$!=$!, \$?=$?");
1182 sub run_with_options {
1183 my $options = shift;
1184 my $name = $options->{name};
1185 $name = "@_" unless defined $name;
1187 my $setgrp = $options->{setpgrp};
1188 if ($options->{timeout}) {
1189 # Unless you explicitly disabled it on the commandline, set it:
1190 $setgrp = 1 unless defined $setgrp;
1193 die_255("Can't fork: $!") unless defined $pid;
1195 if (exists $options->{stdin}) {
1196 open STDIN, '<', $options->{stdin}
1197 or die "Can't open STDIN from $options->{stdin}: $!";
1201 or die "Can't setpgrp 0, 0: $!";
1204 die_255("Failed to start $name: $!");
1207 if ($options->{timeout}) {
1210 die_255("No POSIX::WNOHANG")
1211 unless &POSIX::WNOHANG;
1214 my $victim = $setgrp ? -$pid : $pid;
1216 kill 'TERM', $victim;
1217 waitpid(-1, &POSIX::WNOHANG);
1218 while (kill 0, $victim) {
1220 waitpid(-1, &POSIX::WNOHANG);
1223 if (kill 'KILL', $victim) {
1224 print STDERR "$0: Had to kill 'KILL', $victim\n"
1225 } elsif (! $!{ESRCH}) {
1226 print STDERR "$0: kill 'KILL', $victim failed: $!\n";
1231 report_and_exit(0, 'No timeout', 'Timeout', "when running $name");
1233 alarm $options->{timeout};
1236 or die_255("wait for $name, pid $pid failed: $!");
1238 if ($options->{timeout}) {
1239 my $elapsed = time - $start;
1240 if ($elapsed / $options->{timeout} > 0.8) {
1241 print STDERR "$0: Beware, took $elapsed seconds of $options->{timeout} permitted to run $name\n";
1247 sub extract_from_file {
1248 my ($file, $rx, $default) = @_;
1249 my $fh = open_or_die($file);
1251 my @got = $_ =~ $rx;
1252 return wantarray ? @got : $got[0]
1255 return $default if defined $default;
1260 my ($file, $munger) = @_;
1262 my $fh = open_or_die($file);
1264 die_255("Can't read $file: $!") unless defined $orig && close $fh;
1265 my $new = $munger->($orig);
1266 return if $new eq $orig;
1267 $fh = open_or_die($file, '>');
1268 print $fh $new or die_255("Can't print to $file: $!");
1272 # AIX supplies a pre-historic patch program, which certainly predates Linux
1273 # and is probably older than NT. It can't cope with unified diffs. Meanwhile,
1274 # it's hard enough to get git diff to output context diffs, let alone git show,
1275 # and nearly all the patches embedded here are unified. So it seems that the
1276 # path of least resistance is to convert unified diffs to context diffs:
1279 my ($from_out, $to_out, $has_from, $has_to, $delete, $add) = @_;
1280 ++$$has_from if $delete;
1283 if ($delete && $add) {
1284 $$from_out .= "! $_\n" foreach @$delete;
1285 $$to_out .= "! $_\n" foreach @$add;
1287 $$from_out .= "- $_\n" foreach @$delete;
1289 $$to_out .= "+ $_\n" foreach @$add;
1293 # This isn't quite general purpose, as it can't cope with
1294 # '\ No newline at end of file'
1296 my $diff_in = shift;
1299 # Stuff before the diff
1300 while ($diff_in =~ s/\A(?!\*\*\* )(?!--- )([^\n]*\n?)//ms && length $1) {
1304 if (!length $diff_in) {
1305 die_255("That didn't seem to be a diff");
1308 if ($diff_in =~ /\A\*\*\* /ms) {
1309 warn "Seems to be a context diff already\n";
1310 return $diff_out . $diff_in;
1315 if ($diff_in =~ s/\A((?:diff |index )[^\n]+\n)//ms) {
1319 if ($diff_in !~ /\A--- /ms) {
1320 # Stuff after the diff;
1321 return $diff_out . $diff_in;
1323 $diff_in =~ s/\A([^\n]+\n?)//ms;
1325 die_255("Can't parse '$line'") unless $line =~ s/\A--- /*** /ms;
1327 $diff_in =~ s/\A([^\n]+\n?)//ms;
1329 die_255("Can't parse '$line'") unless $line =~ s/\A\+\+\+ /--- /ms;
1335 unless $diff_in =~ s/\A\@\@ (-([0-9]+),([0-9]+) \+([0-9]+),([0-9]+)) \@\@[^\n]*\n?//;
1336 my ($hunk, $from_start, $from_count, $to_start, $to_count)
1337 = ($1, $2, $3, $4, $5);
1338 my $from_end = $from_start + $from_count - 1;
1339 my $to_end = $to_start + $to_count - 1;
1340 my ($from_out, $to_out, $has_from, $has_to, $add, $delete);
1341 while (length $diff_in && ($from_count || $to_count)) {
1342 die_255("Confused in $hunk")
1343 unless $diff_in =~ s/\A([^\n]*)\n//ms;
1345 $line = ' ' unless length $line;
1346 if ($line =~ /^ .*/) {
1347 process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
1351 $from_out .= " $line\n";
1352 $to_out .= " $line\n";
1355 } elsif ($line =~ /^-(.*)/) {
1358 } elsif ($line =~ /^\+(.*)/) {
1362 die_255("Can't parse '$line' as part of hunk $hunk");
1365 process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
1367 die_255("No lines in hunk $hunk")
1368 unless length $from_out || length $to_out;
1369 die_255("No changes in hunk $hunk")
1370 unless $has_from || $has_to;
1371 $diff_out .= "***************\n";
1372 $diff_out .= "*** $from_start,$from_end ****\n";
1373 $diff_out .= $from_out if $has_from;
1374 $diff_out .= "--- $to_start,$to_end ----\n";
1375 $diff_out .= $to_out if $has_to;
1383 sub placate_patch_prog {
1386 if (!defined $use_context) {
1387 my $version = `patch -v 2>&1`;
1388 die_255("Can't run `patch -v`, \$?=$?, bailing out")
1389 unless defined $version;
1390 if ($version =~ /Free Software Foundation/) {
1392 } elsif ($version =~ /Header: patch\.c,v.*\blwall\b/) {
1393 # The system patch is older than Linux, and probably older than
1396 } elsif ($version =~ /Header: patch\.c,v.*\babhinav\b/) {
1397 # Thank you HP. No, we have no idea *which* version this is:
1398 # $Header: patch.c,v 76.1.1.2.1.3 2001/12/03 12:24:52 abhinav Exp $
1406 return $use_context ? ud2cd($patch) : $patch;
1411 my ($patch, $what, $files) = @_;
1412 $what = 'patch' unless defined $what;
1413 unless (defined $files) {
1414 $patch =~ m!^--- [ab]/(\S+)\n\+\+\+ [ba]/\1!sm;
1417 my $patch_to_use = placate_patch_prog($patch);
1418 open my $fh, '|-', 'patch', '-p1' or die_255("Can't run patch: $!");
1419 print $fh $patch_to_use;
1420 return if close $fh;
1421 print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
1422 print STDERR "\nConverted to a context diff <<'EOCONTEXT'\n${patch_to_use}EOCONTEXT\n"
1423 if $patch_to_use ne $patch;
1424 die_255("Can't $what$files: $?, $!");
1428 my ($commit, @files) = @_;
1429 my $patch = `git show $commit @files`;
1430 if (!defined $patch) {
1431 die_255("Can't get commit $commit for @files: $?") if @files;
1432 die_255("Can't get commit $commit: $?");
1434 apply_patch($patch, "patch $commit", @files ? " for @files" : '');
1438 my ($commit, @files) = @_;
1439 my $patch = `git show -R $commit @files`;
1440 if (!defined $patch) {
1441 die_255("Can't get revert commit $commit for @files: $?") if @files;
1442 die_255("Can't get revert commit $commit: $?");
1444 apply_patch($patch, "revert $commit", @files ? " for @files" : '');
1448 my ($file, $commit) = @_;
1449 $commit ||= $options{gold} || 'blead';
1450 system "git show $commit:$file > $file </dev/null"
1451 and die_255("Could not extract $file at revision $commit");
1456 return unless -e $file;
1457 my $fh = open_or_die($file);
1459 return if $line =~ $run_with_our_perl;
1461 die_255("$file is not executable.
1462 system($file, ...) is always going to fail.
1466 return unless $line =~ m{\A#!(/\S+/perl\S*)\s};
1467 die_255("$file will always be run by $1
1468 It won't be tested by the ./perl we build.
1469 If you intended to run it with that perl binary, please change your
1474 If you intended to test it with the ./perl we build, please change your
1479 [You may also need to add -- before ./perl to prevent that -Ilib as being
1480 parsed as an argument to bisect.pl]
1486 if ($options{clean}) {
1487 # Needed, because files that are build products in this checked out
1488 # version might be in git in the next desired version.
1489 system 'git clean -qdxf </dev/null';
1490 # Needed, because at some revisions the build alters checked out files.
1491 # (eg pod/perlapi.pod). Also undoes any changes to makedepend.SH
1492 system 'git reset --hard HEAD </dev/null';
1499 warn "skipping - $reason";
1503 sub report_and_exit {
1504 my ($good, $pass, $fail, $desc) = @_;
1508 my $got = ($options{'expect-pass'} ? $good : !$good) ? 'good' : 'bad';
1510 print "$got - $pass $desc\n";
1512 print "$got - $fail $desc\n";
1515 exit($got eq 'bad');
1518 sub run_report_and_exit {
1519 my $ret = run_with_options({setprgp => $options{setpgrp},
1520 timeout => $options{timeout},
1522 $ret &= 0xff if $options{crash};
1523 report_and_exit(!$ret, 'zero exit from', 'non-zero exit from', "@_");
1526 sub match_and_exit {
1527 my ($target, @globs) = @_;
1529 my $re = qr/$match/;
1534 foreach (sort map { File::Glob::bsd_glob($_)} @globs) {
1535 if (!-f $_ || !-r _) {
1536 warn "Skipping matching '$_' as it is not a readable file\n";
1543 @files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
1547 foreach my $file (@files) {
1548 my $fh = open_or_die($file);
1552 if (/[^[:^cntrl:]\h\v]/) { # Matches non-spacing non-C1 controls
1553 print "Binary file $file matches\n";
1555 $_ .= "\n" unless /\n\z/;
1562 report_and_exit($matches,
1563 $matches == 1 ? '1 match for' : "$matches matches for",
1564 'no matches for', $match);
1567 # Not going to assume that system perl is yet new enough to have autodie
1568 system_or_die('git clean -dxf');
1570 if (!defined $target) {
1571 match_and_exit(undef, @ARGV) if $match;
1572 $target = 'test_prep';
1573 } elsif ($target eq 'none') {
1574 match_and_exit(undef, @ARGV) if $match;
1575 run_report_and_exit(@ARGV);
1578 skip('no Configure - is this the //depot/perlext/Compiler branch?')
1579 unless -f 'Configure';
1581 my $case_insensitive;
1583 my ($dev_C, $ino_C) = stat 'Configure';
1584 die_255("Could not stat Configure: $!") unless defined $dev_C;
1585 my ($dev_c, $ino_c) = stat 'configure';
1587 if defined $dev_c && $dev_C == $dev_c && $ino_C == $ino_c;
1590 # This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
1592 = extract_from_file('patchlevel.h',
1593 qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/,
1596 my $unfixable_db_file;
1599 && !extract_from_file('ext/DB_File/DB_File.xs',
1600 qr!^#else /\* Berkeley DB Version > 2 \*/$!)) {
1601 # This DB_File.xs is really too old to patch up.
1602 # Skip DB_File, unless we're invoked with an explicit -Unoextensions
1603 if (!exists $defines{noextensions}) {
1604 $defines{noextensions} = 'DB_File';
1605 } elsif (defined $defines{noextensions}) {
1606 $defines{noextensions} .= ' DB_File';
1608 ++$unfixable_db_file;
1613 if ($options{'all-fixups'}) {
1618 apply_fixups($options{'early-fixup'});
1620 # if Encode is not needed for the test, you can speed up the bisect by
1621 # excluding it from the runs with -Dnoextensions=Encode
1622 # ccache is an easy win. Remove it if it causes problems.
1623 # Commit 1cfa4ec74d4933da adds ignore_versioned_solibs to Configure, and sets it
1624 # to true in hints/linux.sh
1625 # On dromedary, from that point on, Configure (by default) fails to find any
1626 # libraries, because it scans /usr/local/lib /lib /usr/lib, which only contain
1627 # versioned libraries. Without -lm, the build fails.
1628 # Telling /usr/local/lib64 /lib64 /usr/lib64 works from that commit onwards,
1629 # until commit faae14e6e968e1c0 adds it to the hints.
1630 # However, prior to 1cfa4ec74d4933da telling Configure the truth doesn't work,
1631 # because it will spot versioned libraries, pass them to the compiler, and then
1632 # bail out pretty early on. Configure won't let us override libswanted, but it
1633 # will let us override the entire libs list.
1635 foreach (@{$options{A}}) {
1636 push @paths, $1 if /^libpth=(.*)/s;
1639 unless (extract_from_file('Configure', 'ignore_versioned_solibs')) {
1640 # Before 1cfa4ec74d4933da, so force the libs list.
1643 # This is the current libswanted list from Configure, less the libs removed
1644 # by current hints/linux.sh
1645 foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl
1646 ld sun m crypt sec util c cposix posix ucb BSD)) {
1647 foreach my $dir (@paths) {
1648 # Note the wonderful consistency of dot-or-not in the config vars:
1649 next unless -f "$dir/lib$lib.$Config{dlext}"
1650 || -f "$dir/lib$lib$Config{lib_ext}";
1651 push @libs, "-l$lib";
1655 $defines{libs} = \@libs unless exists $defines{libs};
1658 $defines{usenm} = undef
1659 if $major < 2 && !exists $defines{usenm};
1661 my ($missing, $created_dirs);
1662 ($missing, $created_dirs) = force_manifest()
1663 if $options{'force-manifest'};
1666 foreach my $key (sort keys %defines) {
1667 my $val = $defines{$key};
1669 push @ARGS, "-D$key=@$val";
1670 } elsif (!defined $val) {
1671 push @ARGS, "-U$key";
1672 } elsif (!length $val) {
1673 push @ARGS, "-D$key";
1675 $val = "" if $val eq "\0";
1676 push @ARGS, "-D$key=$val";
1679 push @ARGS, map {"-A$_"} @{$options{A}};
1683 # Testing a module? We need to install perl/cpan modules to a temp dir
1684 if ($options{module} || $options{'with-module'} || $options{'test-module'})
1686 $prefix = tempdir(CLEANUP => 1);
1688 push @ARGS, "-Dprefix=$prefix";
1689 push @ARGS, "-Uversiononly", "-Dinstallusrbinperl=n";
1692 # If a file in MANIFEST is missing, Configure asks if you want to
1693 # continue (the default being 'n'). With stdin closed or /dev/null,
1694 # it exits immediately and the check for config.sh below will skip.
1695 # Without redirecting stdin, the commands called will attempt to read from
1696 # stdin (and thus effectively hang)
1697 run_with_options({stdin => '/dev/null', name => 'Configure'},
1698 './Configure', @ARGS);
1700 patch_SH() unless $options{'all-fixups'};
1701 apply_fixups($options{'late-fixup'});
1703 if (-f 'config.sh') {
1704 # Emulate noextensions if Configure doesn't support it.
1706 if $major < 10 && $defines{noextensions};
1707 if (system './Configure -S') {
1708 # See commit v5.23.5-89-g7a4fcb3. Configure may try to run
1709 # ./optdef.sh instead of UU/optdef.sh. Copying the file is
1710 # easier than patching Configure (which mentions optdef.sh multi-
1713 File::Copy::copy("UU/optdef.sh", "./optdef.sh");
1714 system_or_die('./Configure -S');
1718 if ($target =~ /config\.s?h/) {
1719 match_and_exit($target, @ARGV) if $match && -f $target;
1720 report_and_exit(-f $target, 'could build', 'could not build', $target)
1721 if $options{'test-build'};
1723 skip("could not build $target") unless -f $target;
1725 run_report_and_exit(@ARGV);
1726 } elsif (!-f 'config.sh') {
1727 # Skip if something went wrong with Configure
1729 skip('could not build config.sh');
1732 force_manifest_cleanup($missing, $created_dirs)
1735 if($options{'force-regen'}
1736 && extract_from_file('Makefile', qr/\bregen_headers\b/)) {
1737 # regen_headers was added in e50aee73b3d4c555, patch.1m for perl5.001
1738 # It's not worth faking it for earlier revisions.
1739 system_or_die('make regen_headers');
1742 unless ($options{'all-fixups'}) {
1747 # Parallel build for miniperl is safe
1748 system "$options{make} $j miniperl </dev/null";
1750 # This is the file we expect make to create
1751 my $expected_file = $target =~ /^test/ ? 't/perl'
1752 : $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
1754 # This is the target we tell make to build in order to get $expected_file
1755 my $real_target = $target eq 'Fcntl' ? $expected_file : $target;
1757 if ($target ne 'miniperl') {
1758 # Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
1759 $j = '' if $major < 10;
1761 if ($real_target eq 'test_prep') {
1763 # test-prep was added in 5.004_01, 3e3baf6d63945cb6.
1764 # renamed to test_prep in 2001 in 5fe84fd29acaf55c.
1765 # earlier than that, just make test. It will be fast enough.
1766 $real_target = extract_from_file('Makefile.SH',
1767 qr/^(test[-_]prep):/,
1772 system "$options{make} $j $real_target </dev/null";
1775 my $expected_file_found = $expected_file =~ /perl$/
1776 ? -x $expected_file : -r $expected_file;
1778 if ($expected_file_found && $expected_file eq 't/perl') {
1779 # Check that it isn't actually pointing to ../miniperl, which will happen
1780 # if the sanity check ./miniperl -Ilib -MExporter -e '<?>' fails, and
1781 # Makefile tries to run minitest.
1783 # Of course, helpfully sometimes it's called ../perl, other times .././perl
1784 # and who knows if that list is exhaustive...
1785 my ($dev0, $ino0) = stat 't/perl';
1786 my ($dev1, $ino1) = stat 'perl';
1787 unless (defined $dev0 && defined $dev1 && $dev0 == $dev1 && $ino0 == $ino1) {
1788 undef $expected_file_found;
1789 my $link = readlink $expected_file;
1790 warn "'t/perl' => '$link', not 'perl'";
1791 die_255("Could not realink t/perl: $!") unless defined $link;
1795 my $just_testing = 0;
1797 if ($options{'test-build'}) {
1798 report_and_exit($expected_file_found, 'could build', 'could not build',
1800 } elsif (!$expected_file_found) {
1801 skip("could not build $real_target");
1802 } elsif (my $mod_opt = $options{module} || $options{'with-module'}
1803 || ($just_testing++, $options{'test-module'})) {
1804 # Testing a cpan module? See if it will install
1805 # First we need to install this perl somewhere
1806 system_or_die('./installperl');
1808 my @m = split(',', $mod_opt);
1810 my $bdir = File::Temp::tempdir(
1814 # Don't ever stop to ask the user for input
1815 $ENV{AUTOMATED_TESTING} = 1;
1816 $ENV{PERL_MM_USE_DEFAULT} = 1;
1818 # Don't let these interfere with our cpan installs
1819 delete $ENV{PERL_MB_OPT};
1820 delete $ENV{PERL_MM_OPT};
1822 # Make sure we load up our CPAN::MyConfig and then
1823 # override the build_dir so we have a fresh one
1825 my $cdir = $options{'cpan-config-dir'}
1826 || File::Spec->catfile($ENV{HOME},".cpan");
1833 "-e","\$CPAN::Config->{build_dir}=q{$bdir};",
1838 s/-/::/g if /-/ and !m|/|;
1840 my $install = join ",", map { "'$_'" } @m;
1841 if ($just_testing) {
1842 $install = "test($install)";
1843 } elsif ($options{'no-module-tests'}) {
1844 $install = "notest('install',$install)";
1846 $install = "install($install)";
1849 my $status_method = $just_testing ? 'test' : 'uptodate';
1850 my $shellcmd = "$install; die unless CPAN::Shell->expand(Module => '$last')->$status_method;";
1852 if ($options{module} || $options{'test-module'}) {
1853 run_report_and_exit(@cpanshell, $shellcmd);
1855 my $ret = run_with_options({setprgp => $options{setpgrp},
1856 timeout => $options{timeout},
1857 }, @cpanshell, $shellcmd);
1858 $ret &= 0xff if $options{crash};
1862 report_and_exit(!$ret, 'zero exit from', 'non-zero exit from', "@_");
1867 match_and_exit($real_target, @ARGV) if $match;
1869 if (defined $options{'one-liner'}) {
1870 my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
1871 unshift @ARGV, map {('-e', $_)} @{$options{'one-liner'}};
1872 foreach (qw(c l w)) {
1873 unshift @ARGV, "-$_" if $options{$_};
1875 unshift @ARGV, "./$exe", '-Ilib';
1879 my $fh = open_or_die($ARGV[0]);
1881 unshift @ARGV, $1, '-Ilib'
1882 if $line =~ $run_with_our_perl;
1885 if ($options{valgrind}) {
1886 # Turns out to be too confusing to use an optional argument with the path
1887 # of the valgrind binary, as if --valgrind takes an optional argument,
1888 # then specifying it as the last option eats the first part of the testcase.
1889 # ie this: .../bisect.pl --valgrind testcase
1890 # is treated as --valgrind=testcase and as there is no test case given,
1891 # it's an invalid commandline, bailing out with the usage message.
1893 # Currently, the test script can't signal a skip with 125, so anything
1894 # non-zero would do. But to keep that option open in future, use 124
1895 unshift @ARGV, 'valgrind', '--error-exitcode=124';
1898 # This is what we came here to run:
1900 if (exists $Config{ldlibpthname}) {
1902 my $varname = $Config{ldlibpthname};
1903 my $cwd = Cwd::getcwd();
1904 if (defined $ENV{$varname}) {
1905 $ENV{$varname} = $cwd . $Config{path_sep} . $ENV{$varname};
1907 $ENV{$varname} = $cwd;
1911 run_report_and_exit(@ARGV);
1913 ############################################################################
1915 # Patching, editing and faking routines only below here.
1917 ############################################################################
1919 sub fake_noextensions {
1920 edit_file('config.sh', sub {
1921 my @lines = split /\n/, shift;
1922 my @ext = split /\s+/, $defines{noextensions};
1924 next unless /^extensions=/ || /^dynamic_ext/;
1925 foreach my $ext (@ext) {
1929 return join "\n", @lines;
1933 sub force_manifest {
1934 my (@missing, @created_dirs);
1935 my $fh = open_or_die('MANIFEST');
1937 next unless /^(\S+)/;
1938 # -d is special case needed (at least) between 27332437a2ed1941 and
1939 # bf3d9ec563d25054^ inclusive, as manifest contains ext/Thread/Thread
1941 unless -f $1 || -d $1;
1945 foreach my $pathname (@missing) {
1946 my @parts = split '/', $pathname;
1947 my $leaf = pop @parts;
1950 $path .= '/' . shift @parts;
1952 mkdir $path, 0700 or die_255("Can't create $path: $!");
1953 unshift @created_dirs, $path;
1955 $fh = open_or_die($pathname, '>');
1957 chmod 0, $pathname or die_255("Can't chmod 0 $pathname: $!");
1959 return \@missing, \@created_dirs;
1962 sub force_manifest_cleanup {
1963 my ($missing, $created_dirs) = @_;
1964 # This is probably way too paranoid:
1967 foreach my $file (@$missing) {
1968 my (undef, undef, $mode, undef, undef, undef, undef, $size)
1970 if (!defined $mode) {
1971 push @errors, "Added file $file has been deleted by Configure";
1974 if (Fcntl::S_IMODE($mode) != 0) {
1976 sprintf 'Added file %s had mode changed by Configure to %03o',
1981 "Added file $file had sized changed by Configure to $size";
1983 unlink $file or die_255("Can't unlink $file: $!");
1985 foreach my $dir (@$created_dirs) {
1986 rmdir $dir or die_255("Can't rmdir $dir: $!");
1992 sub patch_Configure {
1994 if (extract_from_file('Configure',
1995 qr/^\t\t\*=\*\) echo "\$1" >> \$optdef;;$/)) {
1996 # This is " Spaces now allowed in -D command line options.",
1997 # part of commit ecfc54246c2a6f42
1998 apply_patch(<<'EOPATCH');
1999 diff --git a/Configure b/Configure
2000 index 3d3b38d..78ffe16 100755
2003 @@ -652,7 +777,8 @@ while test $# -gt 0; do
2004 echo "$me: use '-U symbol=', not '-D symbol='." >&2
2005 echo "$me: ignoring -D $1" >&2
2007 - *=*) echo "$1" >> $optdef;;
2008 + *=*) echo "$1" | \
2009 + sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;;
2010 *) echo "$1='define'" >> $optdef;;
2016 if (extract_from_file('Configure', qr/^if \$contains 'd_namlen' \$xinc\b/)) {
2017 # Configure's original simple "grep" for d_namlen falls foul of the
2018 # approach taken by the glibc headers:
2019 # #ifdef _DIRENT_HAVE_D_NAMLEN
2020 # # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
2022 # where _DIRENT_HAVE_D_NAMLEN is not defined on Linux.
2023 # This is also part of commit ecfc54246c2a6f42
2024 apply_patch(<<'EOPATCH');
2025 diff --git a/Configure b/Configure
2026 index 3d3b38d..78ffe16 100755
2029 @@ -3935,7 +4045,8 @@ $rm -f try.c
2031 : see if the directory entry stores field length
2033 -if $contains 'd_namlen' $xinc >/dev/null 2>&1; then
2034 +$cppstdin $cppflags $cppminus < "$xinc" > try.c
2035 +if $contains 'd_namlen' try.c >/dev/null 2>&1; then
2036 echo "Good, your directory entry keeps length information in d_namlen." >&4
2044 && !extract_from_file('Configure',
2045 qr/Try to guess additional flags to pick up local libraries/)) {
2046 my $mips = extract_from_file('Configure',
2047 qr!(''\) if (?:\./)?mips; then)!);
2048 # This is part of perl-5.001n. It's needed, to add -L/usr/local/lib to
2049 # the ld flags if libraries are found there. It shifts the code to set
2050 # up libpth earlier, and then adds the code to add libpth entries to
2052 # mips was changed to ./mips in ecfc54246c2a6f42, perl5.000 patch.0g
2053 apply_patch(sprintf <<'EOPATCH', $mips);
2054 diff --git a/Configure b/Configure
2055 index 53649d5..0635a6e 100755
2058 @@ -2749,6 +2749,52 @@ EOM
2062 +: Set private lib path
2064 +'') if ./mips; then
2065 + plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
2070 +'') dlist="$plibpth $glibpth";;
2071 +*) dlist="$libpth";;
2074 +: Now check and see which directories actually exist, avoiding duplicates
2078 + if $test -d $xxx; then
2079 + case " $libpth " in
2081 + *) libpth="$libpth $xxx";;
2087 +Some systems have incompatible or broken versions of libraries. Among
2088 +the directories listed in the question below, please remove any you
2089 +know not to be holding relevant libraries, and add any that are needed.
2090 +Say "none" for none.
2101 +rp="Directories to use for library searches?"
2108 : flags used in final linking phase
2110 '') if ./venix; then
2111 @@ -2765,6 +2811,23 @@ case "$ldflags" in
2113 *) dflt="$ldflags";;
2116 +: Possible local library directories to search.
2117 +loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
2118 +loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
2120 +: Try to guess additional flags to pick up local libraries.
2121 +for thislibdir in $libpth; do
2122 + case " $loclibpth " in
2123 + *" $thislibdir "*)
2125 + "-L$thislibdir ") ;;
2126 + *) dflt="$dflt -L$thislibdir" ;;
2133 rp="Any additional ld flags (NOT including libraries)?"
2135 @@ -2828,52 +2891,6 @@ n) echo "OK, that should do.";;
2137 $rm -f try try.* core
2139 -: Set private lib path
2142 - plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
2147 -'') dlist="$plibpth $glibpth";;
2148 -*) dlist="$libpth";;
2151 -: Now check and see which directories actually exist, avoiding duplicates
2155 - if $test -d $xxx; then
2156 - case " $libpth " in
2158 - *) libpth="$libpth $xxx";;
2164 -Some systems have incompatible or broken versions of libraries. Among
2165 -the directories listed in the question below, please remove any you
2166 -know not to be holding relevant libraries, and add any that are needed.
2167 -Say "none" for none.
2178 -rp="Directories to use for library searches?"
2185 : compute shared library extension
2191 if ($major == 4 && extract_from_file('Configure', qr/^d_gethbynam=/)) {
2192 # Fixes a bug introduced in 4599a1dedd47b916
2193 apply_commit('3cbc818d1d0ac470');
2196 if ($major == 4 && extract_from_file('Configure',
2197 qr/gethbadd_addr_type=`echo \$gethbadd_addr_type/)) {
2198 # Fixes a bug introduced in 3fd537d4b944bc7a
2199 apply_commit('6ff9219da6cf8cfd');
2202 if ($major == 4 && extract_from_file('Configure',
2203 qr/^pthreads_created_joinable=/)) {
2204 # Fix for bug introduced in 52e1cb5ebf5e5a8c
2205 # Part of commit ce637636a41b2fef
2206 edit_file('Configure', sub {
2208 $code =~ s{^pthreads_created_joinable=''}
2209 {d_pthreads_created_joinable=''}ms
2210 or die_255("Substitution failed");
2211 $code =~ s{^pthreads_created_joinable='\$pthreads_created_joinable'}
2212 {d_pthreads_created_joinable='\$d_pthreads_created_joinable'}ms
2213 or die_255("Substitution failed");
2218 if ($major < 5 && extract_from_file('Configure',
2219 qr!if \$cc \$ccflags try\.c -o try >/dev/null 2>&1; then!)) {
2220 # Analogous to the more general fix of dfe9444ca7881e71
2221 # Without this flags such as -m64 may not be passed to this compile,
2222 # which results in a byteorder of '1234' instead of '12345678', which
2223 # can then cause crashes.
2225 if (extract_from_file('Configure', qr/xxx_prompt=y/)) {
2226 # 8e07c86ebc651fe9 or later
2227 # ("This is my patch patch.1n for perl5.001.")
2228 apply_patch(<<'EOPATCH');
2229 diff --git a/Configure b/Configure
2230 index 62249dd..c5c384e 100755
2233 @@ -8247,7 +8247,7 @@ main()
2237 - if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
2238 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
2241 [1-4][1-4][1-4][1-4]|12345678|87654321)
2244 apply_patch(<<'EOPATCH');
2245 diff --git a/Configure b/Configure
2246 index 53649d5..f1cd64a 100755
2249 @@ -6362,7 +6362,7 @@ main()
2253 - if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
2254 + if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 ; then
2257 ????|????????) echo "(The test program ran ok.)";;
2262 if ($major < 6 && !extract_from_file('Configure',
2264 # This adds the -A option to Configure, which is incredibly useful
2265 # Effectively this is commits 02e93a22d20fc9a5, 5f83a3e9d818c3ad,
2266 # bde6b06b2c493fef, f7c3111703e46e0c and 2 lines of trailing whitespace
2267 # removed by 613d6c3e99b9decc, but applied at slightly different
2268 # locations to ensure a clean patch back to 5.000
2269 # Note, if considering patching to the intermediate revisions to fix
2270 # bugs in -A handling, f7c3111703e46e0c is from 2002, and hence
2273 # To add to the fun, early patches add -K and -O options, and it's not
2274 # trivial to get patch to put the C<. ./posthint.sh> in the right place
2275 edit_file('Configure', sub {
2277 $code =~ s/(optstr = ")([^"]+";\s*# getopt-style specification)/$1A:$2/
2278 or die_255("Substitution failed");
2279 $code =~ s!^(: who configured the system)!
2284 or die_255("Substitution failed");
2287 apply_patch(<<'EOPATCH');
2288 diff --git a/Configure b/Configure
2289 index 4b55fa6..60c3c64 100755
2292 @@ -1150,6 +1150,7 @@ set X `for arg in "$@"; do echo "X$arg"; done |
2298 : set up default values
2300 @@ -1172,6 +1173,56 @@ while test $# -gt 0; do
2302 -d) shift; fastread=yes;;
2303 -e) shift; alldone=cont;;
2311 + *=*) zzz=`echo "$yyy"|sed 's!=.*!!'`
2315 + zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'`
2316 + yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
2321 + '') case "$yyy" in
2322 + *:*) xxx=`echo "$yyy"|sed 's!:.*!!'`
2323 + yyy=`echo "$yyy"|sed 's!^[^:]*:!!'`
2324 + zzz=`echo "$yyy"|sed 's!^[^=]*=!!'`
2325 + yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
2326 + *) xxx=`echo "$yyy"|sed 's!:.*!!'`
2327 + yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;;
2333 + echo "$yyy=\"\${$yyy}$zzz\"" >> posthint.sh ;;
2335 + echo "$yyy=''" >> posthint.sh ;;
2340 + echo "$yyy='$zzz'" >> posthint.sh ;;
2342 + echo "eval \"$yyy=$zzz\"" >> posthint.sh ;;
2344 + echo "$yyy=\"$zzz\${$yyy}\"" >> posthint.sh ;;
2349 + echo "$yyy=$zzz" >> posthint.sh ;;
2350 + *) echo "$me: unknown -A command '$xxx', ignoring -A $1" >&2 ;;
2360 if ($major < 8 && $^O eq 'aix') {
2361 edit_file('Configure', sub {
2363 # Replicate commit a8c676c69574838b
2364 # Whitespace allowed at the ends of /lib/syscalls.exp lines
2365 # and half of commit c6912327ae30e6de
2366 # AIX syscalls.exp scan: the syscall might be marked 32, 3264, or 64
2367 $code =~ s{(\bsed\b.*\bsyscall)(?:\[0-9\]\*)?(\$.*/lib/syscalls\.exp)}
2368 {$1 . "[0-9]*[ \t]*" . $2}e;
2373 if ($major < 8 && !extract_from_file('Configure',
2374 qr/^\t\tif test ! -t 0; then$/)) {
2375 # Before dfe9444ca7881e71, Configure would refuse to run if stdin was
2376 # not a tty. With that commit, the tty requirement was dropped for -de
2378 # Commit aaeb8e512e8e9e14 dropped the tty requirement for -S
2379 # For those older versions, it's probably easiest if we simply remove
2381 edit_file('Configure', sub {
2383 $code =~ s/test ! -t 0/test Perl = rules/;
2388 if ($major == 8 || $major == 9) {
2389 # Fix symbol detection to that of commit 373dfab3839ca168 if it's any
2390 # intermediate version 5129fff43c4fe08c or later, as the intermediate
2391 # versions don't work correctly on (at least) Sparc Linux.
2392 # 5129fff43c4fe08c adds the first mention of mistrustnm.
2393 # 373dfab3839ca168 removes the last mention of lc=""
2394 edit_file('Configure', sub {
2397 if $code !~ /\btc="";/; # 373dfab3839ca168 or later
2399 if $code !~ /\bmistrustnm\b/; # before 5129fff43c4fe08c
2400 my $fixed = <<'EOC';
2402 : is a C symbol defined?
2405 -v) tf=libc.tmp; tdc="";;
2406 -a) tf=libc.tmp; tdc="[]";;
2407 *) tlook="^$1\$"; tf=libc.list; tdc="()";;
2410 case "$reuseval-$4" in
2412 true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;;
2417 if $test "$runnm" = true; then
2418 if $contains $tlook $tf >/dev/null 2>&1; then
2420 elif $test "$mistrustnm" = compile -o "$mistrustnm" = run; then
2421 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
2422 $cc -o try $optimize $ccflags $ldflags try.c >/dev/null 2>&1 $libs && tval=true;
2423 $test "$mistrustnm" = run -a -x try && { $run ./try$_exe >/dev/null 2>&1 || tval=false; };
2424 $rm -f try$_exe try.c core core.* try.core;
2427 echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
2428 $cc -o try $optimize $ccflags $ldflags try.c $libs >/dev/null 2>&1 && tval=true;
2429 $rm -f try$_exe try.c;
2434 $define) tval=true;;
2442 $code =~ s/\n: is a C symbol defined\?\n.*?\neval "\$2=\$tval"'\n\n/$fixed/sm
2443 or die_255("substitution failed");
2449 && extract_from_file('Configure', qr/^set malloc\.h i_malloc$/)) {
2450 # This is commit 01d07975f7ef0e7d, trimmed, with $compile inlined as
2451 # prior to bd9b35c97ad661cc Configure had the malloc.h test before the
2452 # definition of $compile.
2453 apply_patch(<<'EOPATCH');
2454 diff --git a/Configure b/Configure
2455 index 3d2e8b9..6ce7766 100755
2458 @@ -6743,5 +6743,22 @@ set d_dosuid
2460 : see if this is a malloc.h system
2461 -set malloc.h i_malloc
2463 +: we want a real compile instead of Inhdr because some systems have a
2464 +: malloc.h that just gives a compile error saying to use stdlib.h instead
2467 +#include <stdlib.h>
2468 +#include <malloc.h>
2469 +int main () { return 0; }
2472 +if $cc $optimize $ccflags $ldflags -o try $* try.c $libs > /dev/null 2>&1; then
2473 + echo "<malloc.h> found." >&4
2476 + echo "<malloc.h> NOT found." >&4
2488 if ($^O eq 'freebsd') {
2489 # There are rather too many version-specific FreeBSD hints fixes to
2490 # patch individually. Also, more than once the FreeBSD hints file has
2491 # been written in what turned out to be a rather non-future-proof style,
2492 # with case statements treating the most recent version as the
2493 # exception, instead of treating previous versions' behaviour explicitly
2494 # and changing the default to cater for the current behaviour. (As
2495 # strangely, future versions inherit the current behaviour.)
2496 checkout_file('hints/freebsd.sh');
2497 } elsif ($^O eq 'darwin') {
2499 # We can't build on darwin without some of the data in the hints
2500 # file. Probably less surprising to use the earliest version of
2501 # hints/darwin.sh and then edit in place just below, than use
2502 # blead's version, as that would create a discontinuity at
2503 # f556e5b971932902 - before it, hints bugs would be "fixed", after
2504 # it they'd resurface. This way, we should give the illusion of
2505 # monotonic bug fixing.
2507 if (!-f 'hints/darwin.sh') {
2508 checkout_file('hints/darwin.sh', 'f556e5b971932902');
2512 edit_file('hints/darwin.sh', sub {
2514 # Part of commit 8f4f83badb7d1ba9, which mostly undoes
2515 # commit 0511a818910f476c.
2516 $code =~ s/^cppflags='-traditional-cpp';$/cppflags="\${cppflags} -no-cpp-precomp"/m;
2517 # commit 14c11978e9b52e08/803bb6cc74d36a3f
2518 # Without this, code in libperl.bundle links against op.o
2519 # in preference to opmini.o on the linker command line,
2520 # and hence miniperl tries to use File::Glob instead of
2522 $code =~ s/^(lddlflags=)/ldflags="\${ldflags} -flat_namespace"\n$1/m;
2523 # f556e5b971932902 also patches Makefile.SH with some
2524 # special case code to deal with useshrplib for darwin.
2525 # Given that post 5.8.0 the darwin hints default was
2526 # changed to false, and it would be very complex to splice
2527 # in that code in various versions of Makefile.SH back
2528 # to 5.002, lets just turn it off.
2529 $code =~ s/^useshrplib='true'/useshrplib='false'/m
2532 # Part of commit d235852b65d51c44
2533 # Don't do this on a case sensitive HFS+ partition, as it
2534 # breaks the build for 5.003 and earlier.
2535 if ($case_insensitive
2536 && $code !~ /^firstmakefile=GNUmakefile/) {
2537 $code .= "\nfirstmakefile=GNUmakefile;\n";
2543 } elsif ($^O eq 'netbsd') {
2545 # These are part of commit 099685bc64c7dbce
2546 edit_file('hints/netbsd.sh', sub {
2548 my $fixed = <<'EOC';
2554 if [ -f /usr/libexec/ld.elf_so ]; then
2557 ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
2558 cccdlflags="-DPIC -fPIC $cccdlflags"
2559 lddlflags="--whole-archive -shared $lddlflags"
2560 elif [ "`uname -m`" = "pmax" ]; then
2561 # NetBSD 1.3 and 1.3.1 on pmax shipped an 'old' ld.so, which will not work.
2563 elif [ -f /usr/libexec/ld.so ]; then
2566 ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags"
2567 # we use -fPIC here because -fpic is *NOT* enough for some of the
2568 # extensions like Tk on some netbsd platforms (the sparc is one)
2569 cccdlflags="-DPIC -fPIC $cccdlflags"
2570 lddlflags="-Bforcearchive -Bshareable $lddlflags"
2577 $code =~ s/^case "\$osvers" in\n0\.9\|0\.8.*?^esac\n/$fixed/ms;
2581 } elsif ($^O eq 'openbsd') {
2583 checkout_file('hints/openbsd.sh', '43051805d53a3e4c')
2584 unless -f 'hints/openbsd.sh';
2585 my $which = extract_from_file('hints/openbsd.sh',
2586 qr/# from (2\.8|3\.1) onwards/,
2589 my $was = extract_from_file('hints/openbsd.sh',
2590 qr/(lddlflags="(?:-Bforcearchive )?-Bshareable)/);
2591 # This is commit 154d43cbcf57271c and parts of 5c75dbfa77b0949c
2592 # and 29b5585702e5e025
2593 apply_patch(sprintf <<'EOPATCH', $was);
2594 diff --git a/hints/openbsd.sh b/hints/openbsd.sh
2595 index a7d8bf2..5b79709 100644
2596 --- a/hints/openbsd.sh
2597 +++ b/hints/openbsd.sh
2598 @@ -37,7 +37,25 @@ OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax)
2599 # we use -fPIC here because -fpic is *NOT* enough for some of the
2600 # extensions like Tk on some OpenBSD platforms (ie: sparc)
2601 cccdlflags="-DPIC -fPIC $cccdlflags"
2604 + [01].*|2.[0-7]|2.[0-7].*)
2605 + lddlflags="-Bshareable $lddlflags"
2609 + lddlflags="-shared -fPIC $lddlflags"
2611 + *) # from 3.1 onwards
2613 + lddlflags="-shared -fPIC $lddlflags"
2614 + libswanted=`echo $libswanted | sed 's/ dl / /'`
2618 + # We need to force ld to export symbols on ELF platforms.
2619 + # Without this, dlopen() is crippled.
2620 + ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2621 + test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2626 } elsif ($which eq '2.8') {
2627 # This is parts of 5c75dbfa77b0949c and 29b5585702e5e025, and
2628 # possibly eb9cd59d45ad2908
2629 my $was = extract_from_file('hints/openbsd.sh',
2630 qr/lddlflags="(-shared(?: -fPIC)?) \$lddlflags"/);
2632 apply_patch(sprintf <<'EOPATCH', $was);
2633 --- a/hints/openbsd.sh 2011-10-21 17:25:20.000000000 +0200
2634 +++ b/hints/openbsd.sh 2011-10-21 16:58:43.000000000 +0200
2636 [01].*|2.[0-7]|2.[0-7].*)
2637 lddlflags="-Bshareable $lddlflags"
2639 - *) # from 2.8 onwards
2642 - lddlflags="%s $lddlflags"
2643 + lddlflags="-shared -fPIC $lddlflags"
2645 + *) # from 3.1 onwards
2647 + lddlflags="-shared -fPIC $lddlflags"
2648 + libswanted=`echo $libswanted | sed 's/ dl / /'`
2652 + # We need to force ld to export symbols on ELF platforms.
2653 + # Without this, dlopen() is crippled.
2654 + ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2655 + test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2660 } elsif ($which eq '3.1'
2661 && !extract_from_file('hints/openbsd.sh',
2662 qr/We need to force ld to export symbols on ELF platforms/)) {
2663 # This is part of 29b5585702e5e025
2664 apply_patch(<<'EOPATCH');
2665 diff --git a/hints/openbsd.sh b/hints/openbsd.sh
2666 index c6b6bc9..4839d04 100644
2667 --- a/hints/openbsd.sh
2668 +++ b/hints/openbsd.sh
2669 @@ -54,6 +54,11 @@ alpha-2.[0-8]|mips-*|vax-*|powerpc-2.[0-7]|m88k-*)
2670 libswanted=`echo $libswanted | sed 's/ dl / /'`
2674 + # We need to force ld to export symbols on ELF platforms.
2675 + # Without this, dlopen() is crippled.
2676 + ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
2677 + test -n "$ELF" && ldflags="-Wl,-E $ldflags"
2684 } elsif ($^O eq 'linux') {
2686 # sparc linux seems to need the -Dbool=char -DHAS_BOOL part of
2687 # perl5.000 patch.0n: [address Configure and build issues]
2688 edit_file('hints/linux.sh', sub {
2690 $code =~ s!-I/usr/include/bsd!-Dbool=char -DHAS_BOOL!g;
2696 if (`uname -sm` =~ qr/^Linux sparc/) {
2697 if (extract_from_file('hints/linux.sh', qr/sparc-linux/)) {
2698 # Be sure to use -fPIC not -fpic on Linux/SPARC
2699 apply_commit('f6527d0ef0c13ad4');
2700 } elsif(!extract_from_file('hints/linux.sh',
2701 qr/^sparc-linux\)$/)) {
2702 my $fh = open_or_die('hints/linux.sh', '>>');
2703 print $fh <<'EOT' or die_255($!);
2705 case "`uname -m`" in
2707 case "$cccdlflags" in
2708 *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
2709 *) cccdlflags="$cccdlflags -fPIC" ;;
2718 } elsif ($^O eq 'solaris') {
2719 if (($major == 13 || $major == 14)
2720 && extract_from_file('hints/solaris_2.sh', qr/getconfldllflags/)) {
2721 apply_commit('c80bde4388070c45');
2727 # Cwd.xs added in commit 0d2079faa739aaa9. Cwd.pm moved to ext/ 8 years
2728 # later in commit 403f501d5b37ebf0
2729 if ($major > 0 && <*/Cwd/Cwd.xs>) {
2731 && !extract_from_file('Makefile.SH', qr/^extra_dep=''$/)) {
2732 # The Makefile.PL for Unicode::Normalize needs
2733 # lib/unicore/CombiningClass.pl. Even without a parallel build, we
2734 # need a dependency to ensure that it builds. This is a variant of
2735 # commit 9f3ef600c170f61e. Putting this for earlier versions gives
2736 # us a spot on which to hang the edits below
2737 apply_patch(<<'EOPATCH');
2738 diff --git a/Makefile.SH b/Makefile.SH
2739 index f61d0db..6097954 100644
2742 @@ -155,10 +155,20 @@ esac
2744 : Prepare dependency lists for Makefile.
2747 for f in $dynamic_ext; do
2748 : the dependency named here will never exist
2749 base=`echo "$f" | sed 's/.*\///'`
2750 - dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
2751 + this_target="lib/auto/$f/$base.$dlext"
2752 + dynamic_list="$dynamic_list $this_target"
2754 + : Parallel makes reveal that we have some interdependencies
2756 + Math/BigInt/FastCalc) extra_dep="$extra_dep
2757 +$this_target: lib/auto/List/Util/Util.$dlext" ;;
2758 + Unicode/Normalize) extra_dep="$extra_dep
2759 +$this_target: lib/unicore/CombiningClass.pl" ;;
2764 @@ -987,2 +997,9 @@ n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
2765 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
2768 +$spitshell >>Makefile <<EOF
2772 +$spitshell >>Makefile <<'!NO!SUBS!'
2777 if ($major == 15 && $^O !~ /^(linux|darwin|.*bsd)$/
2778 && extract_from_file('Makefile.SH', qr/^V.* \?= /)) {
2779 # Remove the GNU-make-ism (which the BSD makes also support, but
2780 # most other makes choke on)
2781 apply_patch(<<'EOPATCH');
2782 diff --git a/Makefile.SH b/Makefile.SH
2783 index 94952bd..13e9001 100755
2786 @@ -338,8 +338,8 @@ linux*|darwin)
2787 $spitshell >>$Makefile <<!GROK!THIS!
2788 # If you're going to use valgrind and it can't be invoked as plain valgrind
2789 # then you'll need to change this, or override it on the make command line.
2790 -VALGRIND ?= valgrind
2791 -VG_TEST ?= ./perl -e 1 2>/dev/null
2792 +VALGRIND = valgrind
2793 +VG_TEST = ./perl -e 1 2>/dev/null
2801 if (extract_from_file('patchlevel.h',
2802 qr/^#include "unpushed\.h"/)) {
2803 # I had thought it easier to detect when building one of the 52
2804 # commits with the original method of incorporating the git
2805 # revision and drop parallel make flags. Commits shown by
2806 # git log 46807d8e809cc127^..dcff826f70bf3f64^ ^d4fb0a1f15d1a1c4
2807 # However, it's not actually possible to make miniperl for that
2808 # configuration as-is, because the file .patchnum is only made
2809 # as a side effect of target 'all'
2810 # I also don't think that it's "safe" to simply run
2811 # make_patchnum.sh before the build. We need the proper
2812 # dependency rules in the Makefile to *stop* it being run again
2813 # at the wrong time.
2814 # This range is important because contains the commit that
2815 # merges Schwern's y2038 work.
2816 apply_patch(<<'EOPATCH');
2817 diff --git a/Makefile.SH b/Makefile.SH
2818 index 9ad8b6f..106e721 100644
2821 @@ -540,9 +544,14 @@ sperl.i: perl.c $(h)
2823 .PHONY: all translators utilities make_patchnum
2826 +make_patchnum: lib/Config_git.pl
2828 +lib/Config_git.pl: make_patchnum.sh
2829 sh $(shellflags) make_patchnum.sh
2831 +# .patchnum, unpushed.h and lib/Config_git.pl are built by make_patchnum.sh
2832 +unpushed.h .patchnum: lib/Config_git.pl
2834 # make sure that we recompile perl.c if .patchnum changes
2835 perl$(OBJ_EXT): .patchnum unpushed.h
2838 } elsif (-f '.gitignore'
2839 && extract_from_file('.gitignore', qr/^\.patchnum$/)) {
2840 # 8565263ab8a47cda to 46807d8e809cc127^ inclusive.
2841 edit_file('Makefile.SH', sub {
2843 $code =~ s/^make_patchnum:\n/make_patchnum: .patchnum
2847 .patchnum: make_patchnum.sh
2851 } elsif (-f 'lib/.gitignore'
2852 && extract_from_file('lib/.gitignore',
2853 qr!^/Config_git.pl!)
2854 && !extract_from_file('Makefile.SH',
2855 qr/^uudmap\.h.*:bitcount.h$/)) {
2856 # Between commits and dcff826f70bf3f64 and 0f13ebd5d71f8177^
2857 edit_file('Makefile.SH', sub {
2859 # Bug introduced by 344af494c35a9f0f
2860 # fixed in 0f13ebd5d71f8177
2861 $code =~ s{^(pod/perlapi\.pod) (pod/perlintern\.pod): }
2863 # Bug introduced by efa50c51e3301a2c
2864 # fixed in 0f13ebd5d71f8177
2865 $code =~ s{^(uudmap\.h) (bitcount\.h): }
2868 # The rats nest of getting git_version.h correct
2870 if ($code =~ s{git_version\.h: stock_git_version\.h
2871 \tcp stock_git_version\.h git_version\.h}
2873 # before 486cd780047ff224
2875 # We probably can't build between
2876 # 953f6acfa20ec275^ and 8565263ab8a47cda
2877 # inclusive, but all commits in that range
2878 # relate to getting make_patchnum.sh working,
2879 # so it is extremely unlikely to be an
2880 # interesting bisect target. They will skip.
2882 # No, don't spawn a submake if
2883 # make_patchnum.sh or make_patchnum.pl fails
2884 $code =~ s{\|\| \$\(MAKE\) miniperl.*}
2886 $code =~ s{^\t(sh.*make_patchnum\.sh.*)}
2889 # Use an external perl to run make_patchnum.pl
2890 # because miniperl still depends on
2892 $code =~ s{^\t.*make_patchnum\.pl}
2893 {\t-$^X make_patchnum.pl}m;
2896 # "Truth in advertising" - running
2897 # make_patchnum generates 2 files.
2898 $code =~ s{^make_patchnum:.*}{
2899 make_patchnum: lib/Config_git.pl
2901 git_version.h: lib/Config_git.pl
2903 perlmini\$(OBJ_EXT): git_version.h
2905 lib/Config_git.pl:}m;
2907 # Right, now we've corrected Makefile.SH to
2908 # correctly describe how lib/Config_git.pl and
2909 # git_version.h are made, we need to fix the rest
2911 # This emulates commit 2b63e250843b907e
2912 # This might duplicate the rule stating that
2913 # git_version.h depends on lib/Config_git.pl
2915 $code =~ s{^(?:lib/Config_git\.pl )?git_version\.h: (.* make_patchnum\.pl.*)}
2916 {git_version.h: lib/Config_git.pl
2918 lib/Config_git.pl: $1}m;
2920 # This emulates commits 0f13ebd5d71f8177
2921 # and a04d4598adc57886. It ensures that
2922 # lib/Config_git.pl is built before configpm,
2923 # and that configpm is run exactly once.
2924 $code =~ s{^(\$\(.*?\) )?(\$\(CONFIGPOD\))(: .*? configpm Porting/Glossary)( lib/Config_git\.pl)?}{
2925 # If present, other files depend on $(CONFIGPOD)
2926 ($1 ? "$1: $2\n\n" : '')
2927 # Then the rule we found
2929 # Add dependency if not there
2930 . ($4 ? $4 : ' lib/Config_git.pl')
2939 # Commits dc0655f797469c47 and d11a62fe01f2ecb2
2940 edit_file('Makefile.SH', sub {
2942 foreach my $ext (qw(Encode SDBM_File)) {
2943 next if $code =~ /\b$ext\) extra_dep=/s;
2944 $code =~ s!(\) extra_dep="\$extra_dep
2945 \$this_target: .*?" ;;)
2948 $ext) extra_dep="\$extra_dep
2949 \$this_target: lib/auto/Cwd/Cwd.\$dlext" ;;
2958 # Remove commits 9fec149bb652b6e9 and 5bab1179608f81d8, which add/amend
2959 # rules to automatically run regen scripts that rebuild C headers. These
2960 # cause problems because a git checkout doesn't preserve relative file
2961 # modification times, hence the regen scripts may fire. This will
2962 # obscure whether the repository had the correct generated headers
2964 # Also, the dependency rules for running the scripts were not correct,
2965 # which could cause spurious re-builds on re-running make, and can cause
2966 # complete build failures for a parallel make.
2967 if (extract_from_file('Makefile.SH',
2968 qr/Writing it this way gives make a big hint to always run opcode\.pl before/)) {
2969 apply_commit('70c6e6715e8fec53');
2970 } elsif (extract_from_file('Makefile.SH',
2971 qr/^opcode\.h opnames\.h pp_proto\.h pp\.sym: opcode\.pl$/)) {
2972 revert_commit('9fec149bb652b6e9');
2976 if ($^O eq 'aix' && $major >= 8 && $major < 28
2977 && extract_from_file('Makefile.SH', qr!\Q./$(MINIPERLEXP) makedef.pl\E.*aix!)) {
2978 # This is a variant the AIX part of commit 72bbce3da5eeffde:
2979 # miniperl also needs -Ilib for perl.exp on AIX etc
2980 edit_file('Makefile.SH', sub {
2982 $code =~ s{(\Q./$(MINIPERLEXP)\E) (makedef\.pl.*aix)}
2987 # This is the line before the line we've edited just above:
2988 if ($^O eq 'aix' && $major >= 11 && $major <= 15
2989 && extract_from_file('makedef.pl', qr/^use Config/)) {
2990 edit_file('Makefile.SH', sub {
2991 # The AIX part of commit e6807d8ab22b761c
2992 # It's safe to substitute lib/Config.pm for config.sh
2993 # as lib/Config.pm depends on config.sh
2994 # If the tree is post e6807d8ab22b761c, the substitution
2995 # won't match, which is harmless.
2997 $code =~ s{^(perl\.exp:.* )config\.sh(\b.*)}
2998 {$1 . '$(CONFIGPM)' . $2}me;
3003 # There was a bug in makedepend.SH which was fixed in version 96a8704c.
3004 # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
3005 # Remove this if you're actually bisecting a problem related to
3007 # If you do this, you may need to add in code to correct the output of older
3008 # makedepends, which don't correctly filter newer gcc output such as
3011 # It's the same version in v5.26.0 to v5.34.0
3012 # Post v5.34.0, commit 8d469d0ecbd06a99 completely changes how makedepend.SH
3013 # interacts with Makefile.SH, meaning that it's not a drop-in upgrade.
3014 checkout_file('makedepend.SH', 'v5.34.0')
3017 if ($major < 4 && -f 'config.sh'
3018 && !extract_from_file('config.sh', qr/^trnl=/)) {
3019 # This seems to be necessary to avoid makedepend becoming confused,
3020 # and hanging on stdin. Seems that the code after
3021 # make shlist || ...here... is never run.
3022 edit_file('makedepend.SH', sub {
3024 $code =~ s/^trnl='\$trnl'$/trnl='\\n'/m;
3031 # This is ordered by $major, as it's likely that different platforms may
3032 # well want to share code.
3034 if ($major == 2 && extract_from_file('perl.c', qr/^\tfclose\(e_fp\);$/)) {
3035 # need to patch perl.c to avoid calling fclose() twice on e_fp when
3037 # This diff is part of commit ab821d7fdc14a438. The second close was
3038 # introduced with perl-5.002, commit a5f75d667838e8e7
3039 # Might want a6c477ed8d4864e6 too, for the corresponding change to
3040 # pp_ctl.c (likely without this, eval will have "fun")
3041 apply_patch(<<'EOPATCH');
3042 diff --git a/perl.c b/perl.c
3043 index 03c4d48..3c814a2 100644
3046 @@ -252,6 +252,7 @@ setuid perl scripts securely.\n");
3047 #ifndef VMS /* VMS doesn't have environ array */
3048 origenviron = environ;
3050 + e_tmpname = Nullch;
3054 @@ -405,6 +406,7 @@ setuid perl scripts securely.\n");
3056 if (Fflush(e_fp) || ferror(e_fp) || fclose(e_fp))
3057 croak("Can't write to temp file for -e: %s", Strerror(errno));
3060 scriptname = e_tmpname;
3062 @@ -470,10 +472,10 @@ setuid perl scripts securely.\n");
3063 curcop->cop_line = 0;
3064 curstash = defstash;
3070 (void)UNLINK(e_tmpname);
3071 + Safefree(e_tmpname);
3072 + e_tmpname = Nullch;
3075 /* now that script is parsed, we can modify record separator */
3076 @@ -1369,7 +1371,7 @@ SV *sv;
3077 scriptname = xfound;
3080 - origfilename = savepv(e_fp ? "-e" : scriptname);
3081 + origfilename = savepv(e_tmpname ? "-e" : scriptname);
3082 curcop->cop_filegv = gv_fetchfile(origfilename);
3083 if (strEQ(origfilename,"-"))
3089 if ($major < 3 && $^O eq 'openbsd'
3090 && !extract_from_file('pp_sys.c', qr/BSD_GETPGRP/)) {
3091 # Part of commit c3293030fd1b7489
3092 apply_patch(<<'EOPATCH');
3093 diff --git a/pp_sys.c b/pp_sys.c
3094 index 4608a2a..f0c9d1d 100644
3097 @@ -2903,8 +2903,8 @@ PP(pp_getpgrp)
3102 - value = (I32)getpgrp(pid);
3104 + value = (I32)BSD_GETPGRP(pid);
3107 DIE("POSIX getpgrp can't take an argument");
3108 @@ -2933,8 +2933,8 @@ PP(pp_setpgrp)
3111 TAINT_PROPER("setpgrp");
3113 - SETi( setpgrp(pid, pgrp) >= 0 );
3115 + SETi( BSD_SETPGRP(pid, pgrp) >= 0 );
3117 if ((pgrp != 0) || (pid != 0)) {
3118 DIE("POSIX setpgrp can't take an argument");
3122 if ($major < 4 && $^O eq 'openbsd') {
3124 # Need changes from commit a6e633defa583ad5.
3125 # Commits c07a80fdfe3926b5 and f82b3d4130164d5f changed the same part
3128 if (extract_from_file('perl.h',
3129 qr/^#ifdef HAS_GETPGRP2$/)) {
3133 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
3134 #define TAINT_ENV() if (tainting) taint_env()
3136 ! #ifdef HAS_GETPGRP2
3137 ! # ifndef HAS_GETPGRP
3138 ! # define HAS_GETPGRP
3142 ! #ifdef HAS_SETPGRP2
3143 ! # ifndef HAS_SETPGRP
3144 ! # define HAS_SETPGRP
3149 } elsif (extract_from_file('perl.h',
3150 qr/Gack, you have one but not both of getpgrp2/)) {
3154 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
3155 #define TAINT_ENV() if (tainting) taint_env()
3157 ! #if defined(HAS_GETPGRP2) && defined(HAS_SETPGRP2)
3158 ! # define getpgrp getpgrp2
3159 ! # define setpgrp setpgrp2
3160 ! # ifndef HAS_GETPGRP
3161 ! # define HAS_GETPGRP
3163 ! # ifndef HAS_SETPGRP
3164 ! # define HAS_SETPGRP
3166 ! # ifndef USE_BSDPGRP
3167 ! # define USE_BSDPGRP
3170 ! # if defined(HAS_GETPGRP2) || defined(HAS_SETPGRP2)
3171 ! #include "Gack, you have one but not both of getpgrp2() and setpgrp2()."
3176 } elsif (extract_from_file('perl.h',
3177 qr/^#ifdef USE_BSDPGRP$/)) {
3181 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
3182 #define TAINT_ENV() if (tainting) taint_env()
3184 ! #ifdef USE_BSDPGRP
3185 ! # ifdef HAS_GETPGRP
3186 ! # define BSD_GETPGRP(pid) getpgrp((pid))
3188 ! # ifdef HAS_SETPGRP
3189 ! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
3192 ! # ifdef HAS_GETPGRP2
3193 ! # define BSD_GETPGRP(pid) getpgrp2((pid))
3194 ! # ifndef HAS_GETPGRP
3195 ! # define HAS_GETPGRP
3198 ! # ifdef HAS_SETPGRP2
3199 ! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
3200 ! # ifndef HAS_SETPGRP
3201 ! # define HAS_SETPGRP
3206 #ifndef _TYPES_ /* If types.h defines this it's easy. */
3210 apply_patch(<<"EOPATCH");
3211 *** a/perl.h 2011-10-21 09:46:12.000000000 +0200
3212 --- b/perl.h 2011-10-21 09:46:12.000000000 +0200
3214 #define TAINT_PROPER(s) if (tainting) taint_proper(no_security, s)
3215 #define TAINT_ENV() if (tainting) taint_env()
3217 ! /* XXX All process group stuff is handled in pp_sys.c. Should these
3218 ! defines move there? If so, I could simplify this a lot. --AD 9/96.
3220 ! /* Process group stuff changed from traditional BSD to POSIX.
3221 ! perlfunc.pod documents the traditional BSD-style syntax, so we'll
3222 ! try to preserve that, if possible.
3224 ! #ifdef HAS_SETPGID
3225 ! # define BSD_SETPGRP(pid, pgrp) setpgid((pid), (pgrp))
3227 ! # if defined(HAS_SETPGRP) && defined(USE_BSD_SETPGRP)
3228 ! # define BSD_SETPGRP(pid, pgrp) setpgrp((pid), (pgrp))
3230 ! # ifdef HAS_SETPGRP2 /* DG/UX */
3231 ! # define BSD_SETPGRP(pid, pgrp) setpgrp2((pid), (pgrp))
3235 ! #if defined(BSD_SETPGRP) && !defined(HAS_SETPGRP)
3236 ! # define HAS_SETPGRP /* Well, effectively it does . . . */
3239 ! /* getpgid isn't POSIX, but at least Solaris and Linux have it, and it makes
3240 ! our life easier :-) so we'll try it.
3242 ! #ifdef HAS_GETPGID
3243 ! # define BSD_GETPGRP(pid) getpgid((pid))
3245 ! # if defined(HAS_GETPGRP) && defined(USE_BSD_GETPGRP)
3246 ! # define BSD_GETPGRP(pid) getpgrp((pid))
3248 ! # ifdef HAS_GETPGRP2 /* DG/UX */
3249 ! # define BSD_GETPGRP(pid) getpgrp2((pid))
3253 ! #if defined(BSD_GETPGRP) && !defined(HAS_GETPGRP)
3254 ! # define HAS_GETPGRP /* Well, effectively it does . . . */
3257 ! /* These are not exact synonyms, since setpgrp() and getpgrp() may
3258 ! have different behaviors, but perl.h used to define USE_BSDPGRP
3259 ! (prior to 5.003_05) so some extension might depend on it.
3261 ! #if defined(USE_BSD_SETPGRP) || defined(USE_BSD_GETPGRP)
3262 ! # ifndef USE_BSDPGRP
3263 ! # define USE_BSDPGRP
3267 #ifndef _TYPES_ /* If types.h defines this it's easy. */
3272 if ($major < 4 && $^O eq 'hpux'
3273 && extract_from_file('sv.c', qr/i = _filbuf\(/)) {
3274 apply_patch(<<'EOPATCH');
3275 diff --git a/sv.c b/sv.c
3276 index a1f1d60..0a806f1 100644
3279 @@ -2641,7 +2641,7 @@ I32 append;
3281 FILE_cnt(fp) = cnt; /* deregisterize cnt and ptr */
3283 - i = _filbuf(fp); /* get more characters */
3284 + i = __filbuf(fp); /* get more characters */
3286 ptr = FILE_ptr(fp); /* reregisterize cnt and ptr */
3292 if ($major == 4 && extract_from_file('scope.c', qr/\(SV\*\)SSPOPINT/)) {
3293 # [PATCH] 5.004_04 +MAINT_TRIAL_1 broken when sizeof(int) != sizeof(void)
3294 # Fixes a bug introduced in 161b7d1635bc830b
3295 apply_commit('9002cb76ec83ef7f');
3298 if ($major == 4 && extract_from_file('av.c', qr/AvARRAY\(av\) = 0;/)) {
3299 # Fixes a bug introduced in 1393e20655efb4bc
3300 apply_commit('e1c148c28bf3335b', 'av.c');
3304 my $rest = extract_from_file('perl.c', qr/delimcpy(.*)/);
3305 if (defined $rest and $rest !~ /,$/) {
3306 # delimcpy added in fc36a67e8855d031, perl.c refactored to use it.
3307 # bug introduced in 2a92aaa05aa1acbf, fixed in 8490252049bf42d3
3308 # code then moved to util.c in commit 491527d0220de34e
3309 apply_patch(<<'EOPATCH');
3310 diff --git a/perl.c b/perl.c
3311 index 4eb69e3..54bbb00 100644
3314 @@ -1735,7 +1735,7 @@ SV *sv;
3315 if (len < sizeof tokenbuf)
3316 tokenbuf[len] = '\0';
3317 #else /* ! (atarist || DOSISH) */
3318 - s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend
3319 + s = delimcpy(tokenbuf, tokenbuf + sizeof tokenbuf, s, bufend,
3322 #endif /* ! (atarist || DOSISH) */
3327 if ($major == 4 && $^O eq 'linux') {
3328 # Whilst this is fixed properly in f0784f6a4c3e45e1 which provides the
3329 # Configure probe, it's easier to back out the problematic changes made
3330 # in these previous commits.
3332 # In maint-5.004, the simplest addition is to "correct" the file to
3333 # use the same pre-processor macros as blead had used. Whilst commit
3334 # 9b599b2a63d2324d (reverted below) is described as
3335 # [win32] merge change#887 from maintbranch
3336 # it uses __sun__ and __svr4__ instead of the __sun and __SVR4 of the
3337 # maint branch commit 6cdf74fe31f049dc
3339 edit_file('doio.c', sub {
3341 $code =~ s{defined\(__sun\) && defined\(__SVR4\)}
3342 {defined(__sun__) && defined(__svr4__)}g;
3346 if (extract_from_file('doio.c',
3347 qr!^/\* XXX REALLY need metaconfig test \*/$!)) {
3348 revert_commit('4682965a1447ea44', 'doio.c');
3350 if (my $token = extract_from_file('doio.c',
3351 qr!^#if (defined\(__sun(?:__)?\)) && defined\(__svr4__\) /\* XXX Need metaconfig test \*/$!)) {
3352 my $patch = `git show -R 9b599b2a63d2324d doio.c`;
3353 $patch =~ s/defined\(__sun__\)/$token/g;
3354 apply_patch($patch);
3356 if (extract_from_file('doio.c',
3357 qr!^/\* linux \(and Solaris2\?\) uses :$!)) {
3358 revert_commit('8490252049bf42d3', 'doio.c');
3360 if (extract_from_file('doio.c',
3361 qr/^ unsemds.buf = &semds;$/)) {
3362 revert_commit('8e591e46b4c6543e');
3364 if (extract_from_file('doio.c',
3365 qr!^#ifdef __linux__ /\* XXX Need metaconfig test \*/$!)) {
3366 # Reverts part of commit 3e3baf6d63945cb6
3367 apply_patch(<<'EOPATCH');
3368 diff --git b/doio.c a/doio.c
3369 index 62b7de9..0d57425 100644
3372 @@ -1333,9 +1331,6 @@ SV **sp;
3374 I32 id, n, cmd, infosize, getinfo;
3376 -#ifdef __linux__ /* XXX Need metaconfig test */
3377 - union semun unsemds;
3380 id = SvIVx(*++mark);
3381 n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0;
3382 @@ -1364,29 +1359,11 @@ SV **sp;
3383 infosize = sizeof(struct semid_ds);
3384 else if (cmd == GETALL || cmd == SETALL)
3386 -#ifdef __linux__ /* XXX Need metaconfig test */
3388 - int semctl (int semid, int semnun, int cmd, union semun arg)
3392 - struct semid_ds *buf;
3396 - union semun semds;
3397 - if (semctl(id, 0, IPC_STAT, semds) == -1)
3399 struct semid_ds semds;
3400 if (semctl(id, 0, IPC_STAT, &semds) == -1)
3403 getinfo = (cmd == GETALL);
3404 -#ifdef __linux__ /* XXX Need metaconfig test */
3405 - infosize = semds.buf->sem_nsems * sizeof(short);
3407 infosize = semds.sem_nsems * sizeof(short);
3409 /* "short" is technically wrong but much more portable
3410 than guessing about u_?short(_t)? */
3412 @@ -1429,12 +1406,7 @@ SV **sp;
3416 -#ifdef __linux__ /* XXX Need metaconfig test */
3417 - unsemds.buf = (struct semid_ds *)a;
3418 - ret = semctl(id, n, cmd, unsemds);
3420 ret = semctl(id, n, cmd, (struct semid_ds *)a);
3427 # Incorrect prototype added as part of 8ac853655d9b7447, fixed as part
3428 # of commit dc45a647708b6c54, with at least one intermediate
3429 # modification. Correct prototype for gethostbyaddr has socklen_t
3430 # second. Linux has uint32_t first for getnetbyaddr.
3431 # Easiest just to remove, instead of attempting more complex patching.
3432 # Something similar may be needed on other platforms.
3433 edit_file('pp_sys.c', sub {
3435 $code =~ s/^ struct hostent \*(?:PerlSock_)?gethostbyaddr\([^)]+\);$//m;
3436 $code =~ s/^ struct netent \*getnetbyaddr\([^)]+\);$//m;
3441 if ($major < 5 && $^O eq 'aix'
3442 && !extract_from_file('pp_sys.c',
3443 qr/defined\(HOST_NOT_FOUND\) && !defined\(h_errno\)/)) {
3444 # part of commit dc45a647708b6c54
3445 # Andy Dougherty's configuration patches (Config_63-01 up to 04).
3446 apply_patch(<<'EOPATCH')
3447 diff --git a/pp_sys.c b/pp_sys.c
3448 index c2fcb6f..efa39fb 100644
3451 @@ -54,7 +54,7 @@ extern "C" int syscall(unsigned long,...);
3455 -#ifdef HOST_NOT_FOUND
3456 +#if defined(HOST_NOT_FOUND) && !defined(h_errno)
3464 && `git rev-parse HEAD` eq "22c35a8c2392967a5ba6b5370695be464bd7012c\n") {
3465 # Commit 22c35a8c2392967a is significant,
3466 # "phase 1 of somewhat major rearrangement of PERL_OBJECT stuff"
3467 # but doesn't build due to 2 simple errors. blead in this broken state
3468 # was merged to the cfgperl branch, and then these were immediately
3469 # corrected there. cfgperl (with the fixes) was merged back to blead.
3470 # The resultant rather twisty maze of commits looks like this:
3474 * | | commit 137225782c183172f360c827424b9b9f8adbef0e
3475 |\ \ \ Merge: 22c35a8 2a8ee23
3476 | |/ / Author: Gurusamy Sarathy <gsar@cpan.org>
3477 | | | Date: Fri Oct 30 17:38:36 1998 +0000
3479 | | | integrate cfgperl tweaks into mainline
3481 | | | p4raw-id: //depot/perl@2144
3483 | * | commit 2a8ee23279873759693fa83eca279355db2b665c
3484 | | | Author: Jarkko Hietaniemi <jhi@iki.fi>
3485 | | | Date: Fri Oct 30 13:27:39 1998 +0000
3487 | | | There can be multiple yacc/bison errors.
3489 | | | p4raw-id: //depot/cfgperl@2143
3491 | * | commit 93fb2ac393172fc3e2c14edb20b718309198abbc
3492 | | | Author: Jarkko Hietaniemi <jhi@iki.fi>
3493 | | | Date: Fri Oct 30 13:18:43 1998 +0000
3495 | | | README.posix-bc update.
3497 | | | p4raw-id: //depot/cfgperl@2142
3499 | * | commit 4ec43091e8e6657cb260b5e563df30aaa154effe
3500 | | | Author: Jarkko Hietaniemi <jhi@iki.fi>
3501 | | | Date: Fri Oct 30 09:12:59 1998 +0000
3503 | | | #2133 fallout.
3505 | | | p4raw-id: //depot/cfgperl@2141
3507 | * | commit 134ca994cfefe0f613d43505a885e4fc2100b05c
3508 | |\ \ Merge: 7093112 22c35a8
3509 | |/ / Author: Jarkko Hietaniemi <jhi@iki.fi>
3510 |/| | Date: Fri Oct 30 08:43:18 1998 +0000
3512 | | | Integrate from mainperl.
3514 | | | p4raw-id: //depot/cfgperl@2140
3516 * | | commit 22c35a8c2392967a5ba6b5370695be464bd7012c
3517 | | | Author: Gurusamy Sarathy <gsar@cpan.org>
3518 | | | Date: Fri Oct 30 02:51:39 1998 +0000
3520 | | | phase 1 of somewhat major rearrangement of PERL_OBJECT stuff
3521 | | | (objpp.h is gone, embed.pl now does some of that); objXSUB.h
3522 | | | should soon be automated also; the global variables that
3523 | | | escaped the PL_foo conversion are now reined in; renamed
3524 | | | MAGIC in regcomp.h to REG_MAGIC to avoid collision with the
3525 | | | type of same name; duplicated lists of pp_things in various
3526 | | | places is now gone; result has only been tested on win32
3528 | | | p4raw-id: //depot/perl@2133
3534 # and completely confuses git bisect (and at least me), causing it to
3535 # the bisect run to confidently return the wrong answer, an unrelated
3536 # commit on the cfgperl branch.
3538 apply_commit('4ec43091e8e6657c');
3542 && extract_from_file('pp_sys.c', qr/PERL_EFF_ACCESS_R_OK/)
3543 && !extract_from_file('pp_sys.c', qr/XXX Configure test needed for eaccess/)) {
3544 # Between 5ff3f7a4e03a6b10 and c955f1177b2e311d^
3545 # This is the meat of commit c955f1177b2e311d (without the other
3546 # indenting changes that would cause a conflict).
3547 # Without this 538 revisions won't build on (at least) Linux
3548 apply_patch(<<'EOPATCH');
3549 diff --git a/pp_sys.c b/pp_sys.c
3550 index d60c8dc..867dee4 100644
3553 @@ -198,9 +198,18 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true";
3554 # if defined(I_SYS_SECURITY)
3555 # include <sys/security.h>
3557 -# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
3558 -# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
3559 -# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
3560 + /* XXX Configure test needed for eaccess */
3562 + /* HP SecureWare */
3563 +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
3564 +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
3565 +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
3568 +# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK))
3569 +# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK))
3570 +# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK))
3574 #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF)
3579 && extract_from_file('mg.c', qr/If we're still on top of the stack, pop us off/)
3580 && !extract_from_file('mg.c', qr/PL_savestack_ix -= popval/)) {
3581 # Fix up commit 455ece5e082708b1:
3582 # SSNEW() API for allocating memory on the savestack
3583 # Message-Id: <tqemtae338.fsf@puma.genscan.com>
3584 # Subject: [PATCH 5.005_51] (was: why SAVEDESTRUCTOR()...)
3585 apply_commit('3c8a44569607336e', 'mg.c');
3589 if (extract_from_file('doop.c', qr/croak\(no_modify\);/)
3590 && extract_from_file('doop.c', qr/croak\(PL_no_modify\);/)) {
3591 # Whilst the log suggests that this would only fix 5 commits, in
3592 # practice this area of history is a complete tarpit, and git bisect
3593 # gets very confused by the skips in the middle of the back and
3594 # forth merging between //depot/perl and //depot/cfgperl
3595 apply_commit('6393042b638dafd3');
3598 # One error "fixed" with another:
3599 if (extract_from_file('pp_ctl.c',
3600 qr/\Qstatic void *docatch_body _((void *o));\E/)) {
3601 apply_commit('5b51e982882955fe');
3603 # Which is then fixed by this:
3604 if (extract_from_file('pp_ctl.c',
3605 qr/\Qstatic void *docatch_body _((valist\E/)) {
3606 apply_commit('47aa779ee4c1a50e');
3609 if (extract_from_file('thrdvar.h', qr/PERLVARI\(Tprotect/)
3610 && !extract_from_file('embedvar.h', qr/PL_protect/)) {
3611 # Commit 312caa8e97f1c7ee didn't update embedvar.h
3612 apply_commit('e0284a306d2de082', 'embedvar.h');
3617 && extract_from_file('sv.c',
3618 qr/PerlDir_close\(IoDIRP\((?:\(IO\*\))?sv\)\);/)
3619 && !(extract_from_file('toke.c',
3620 qr/\QIoDIRP(FILTER_DATA(AvFILLp(PL_rsfp_filters))) = NULL\E/)
3621 || extract_from_file('toke.c',
3622 qr/\QIoDIRP(datasv) = (DIR*)NULL;\E/))) {
3623 # Commit 93578b34124e8a3b, //depot/perl@3298
3624 # close directory handles properly when localized,
3625 # tweaked slightly by commit 1236053a2c722e2b,
3626 # add test case for change#3298
3628 # The fix is the last part of:
3630 # various fixes for clean build and test on win32; configpm broken,
3631 # needed to open myconfig.SH rather than myconfig; sundry adjustments
3632 # to bytecode stuff; tweaks to DYNAMIC_ENV_FETCH code to make it
3633 # work under win32; getenv_sv() changed to getenv_len() since SVs
3634 # aren't visible in the lower echelons; remove bogus exports from
3635 # config.sym; PERL_OBJECT-ness for C++ exception support; null out
3636 # IoDIRP in filter_del() or sv_free() will attempt to close it
3638 # The changed code is modified subsequently by commit e0c198038146b7a4
3639 apply_commit('a6c403648ecd5cc7', 'toke.c');
3642 if ($major < 6 && $^O eq 'netbsd'
3643 && !extract_from_file('unixish.h',
3644 qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) {
3645 apply_patch(<<'EOPATCH')
3646 diff --git a/unixish.h b/unixish.h
3647 index 2a6cbcd..eab2de1 100644
3652 /* #define ALTERNATE_SHEBANG "#!" / **/
3654 -#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
3655 +#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__)
3656 # include <signal.h>
3662 if ($major == 7 && $^O eq 'aix' && -f 'ext/List/Util/Util.xs'
3663 && extract_from_file('ext/List/Util/Util.xs', qr/PUSHBLOCK/)
3664 && !extract_from_file('makedef.pl', qr/^Perl_cxinc/)) {
3665 # Need this to get List::Utils 1.03 and later to compile.
3666 # 1.03 also expects to call Perl_pp_rand. Commit d3632a54487acc5f
3667 # fixes this (for the unthreaded case), but it's not until 1.05,
3668 # two days later, that this is fixed properly.
3669 apply_commit('cbb96eed3f175499');
3672 if (($major >= 7 || $major <= 9) && $^O eq 'openbsd'
3673 && `uname -m` eq "sparc64\n"
3674 # added in 2000 by commit cb434fcc98ac25f5:
3675 && extract_from_file('regexec.c',
3676 qr!/\* No need to save/restore up to this paren \*/!)
3677 # re-indented in 2006 by commit 95b2444054382532:
3678 && extract_from_file('regexec.c', qr/^\t\tCURCUR cc;$/)) {
3679 # Need to work around a bug in (at least) OpenBSD's 4.6's sparc64 #
3680 # compiler ["gcc (GCC) 3.3.5 (propolice)"]. Between commits
3681 # 3ec562b0bffb8b8b (2002) and 1a4fad37125bac3e^ (2005) the darling thing
3682 # fails to compile any code for the statement cc.oldcc = PL_regcc;
3684 # If you refactor the code to "fix" that, or force the issue using set
3685 # in the debugger, the stack smashing detection code fires on return
3686 # from S_regmatch(). Turns out that the compiler doesn't allocate any
3687 # (or at least enough) space for cc.
3689 # Restore the "uninitialised" value for cc before function exit, and the
3690 # stack smashing code is placated. "Fix" 3ec562b0bffb8b8b (which
3691 # changes the size of auto variables used elsewhere in S_regmatch), and
3692 # the crash is visible back to bc517b45fdfb539b (which also changes
3693 # buffer sizes). "Unfix" 1a4fad37125bac3e and the crash is visible until
3694 # 5b47454deb66294b. Problem goes away if you compile with -O, or hack
3695 # the code as below.
3697 # Hence this turns out to be a bug in (old) gcc. Not a security bug we
3698 # still need to fix.
3699 apply_patch(<<'EOPATCH');
3700 diff --git a/regexec.c b/regexec.c
3701 index 900b491..6251a0b 100644
3704 @@ -2958,7 +2958,11 @@ S_regmatch(pTHX_ regnode *prog)
3706 *******************************************************************/
3711 + char hack_buff[sizeof(CURCUR) + 1];
3713 +#define cc hack.hack_cc
3714 CHECKPOINT cp = PL_savestack_ix;
3715 /* No need to save/restore up to this paren */
3716 I32 parenfloor = scan->flags;
3717 @@ -2983,6 +2987,7 @@ S_regmatch(pTHX_ regnode *prog)
3718 n = regmatch(PREVOPER(next)); /* start on the WHILEM */
3720 PL_regcc = cc.oldcc;
3728 if ($major < 8 && $^O eq 'openbsd'
3729 && !extract_from_file('perl.h', qr/include <unistd\.h>/)) {
3730 # This is part of commit 3f270f98f9305540, applied at a slightly
3731 # different location in perl.h, where the context is stable back to
3733 apply_patch(<<'EOPATCH');
3734 diff --git a/perl.h b/perl.h
3735 index 9418b52..b8b1a7c 100644
3738 @@ -496,6 +496,10 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
3739 # include <sys/param.h>
3742 +/* If this causes problems, set i_unistd=undef in the hint file. */
3744 +# include <unistd.h>
3747 /* Use all the "standard" definitions? */
3748 #if defined(STANDARD_C) && defined(I_STDLIB)
3754 if (-f 'ext/POSIX/Makefile.PL'
3755 && extract_from_file('ext/POSIX/Makefile.PL',
3756 qr/Explicitly avoid including/)) {
3757 # commit 6695a346c41138df, which effectively reverts 170888cff5e2ffb7
3759 # PERL5LIB is populated by make_ext.pl with paths to the modules we need
3760 # to run, don't override this with "../../lib" since that may not have
3761 # been populated yet in a parallel build.
3762 apply_commit('6695a346c41138df');
3765 if (-f 'ext/Hash/Util/Makefile.PL'
3766 && extract_from_file('ext/Hash/Util/Makefile.PL',
3767 qr/\bDIR\b.*'FieldHash'/)) {
3768 # ext/Hash/Util/Makefile.PL should not recurse to FieldHash's Makefile.PL
3769 # *nix, VMS and Win32 all know how to (and have to) call the latter directly.
3770 # As is, targets in ext/Hash/Util/FieldHash get called twice, which may result
3771 # in race conditions, and certainly messes up make clean; make distclean;
3772 apply_commit('550428fe486b1888');
3775 if ($major < 8 && $^O eq 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') {
3776 checkout_file('ext/DynaLoader/dl_dyld.xs', 'f556e5b971932902');
3777 apply_patch(<<'EOPATCH');
3778 diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
3779 --- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:41:27.000000000 +0100
3780 +++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 21:42:20.000000000 +0100
3794 +# define dTHXa(a) extern int Perl___notused(void)
3795 +# define dTHX extern int Perl___notused(void)
3798 +#ifndef Perl_form_nocontext
3799 +# define Perl_form_nocontext form
3802 +#ifndef Perl_warn_nocontext
3803 +# define Perl_warn_nocontext warn
3807 +# define PTR2IV(p) (IV)(p)
3811 +# define get_av perl_get_av
3814 #define DL_LOADONCEONLY
3816 #include "dlutils.c" /* SaveError() etc */
3819 DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s,%x):\n", filename,flags));
3821 - Perl_warn(aTHX_ "Can't make loaded symbols global on this platform while loading %s",filename);
3822 + Perl_warn_nocontext("Can't make loaded symbols global on this platform while loading %s",filename);
3823 RETVAL = dlopen(filename, mode) ;
3824 DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", RETVAL));
3825 ST(0) = sv_newmortal() ;
3827 if ($major < 4 && !extract_from_file('util.c', qr/^form/m)) {
3828 apply_patch(<<'EOPATCH');
3829 diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
3830 --- a/ext/DynaLoader/dl_dyld.xs~ 2011-10-11 21:56:25.000000000 +0100
3831 +++ b/ext/DynaLoader/dl_dyld.xs 2011-10-11 22:00:00.000000000 +0100
3833 # define get_av perl_get_av
3837 +form(char *pat, ...)
3841 + va_start(args, pat);
3842 + vasprintf(&retval, pat, &args);
3844 + SAVEFREEPV(retval);
3848 #define DL_LOADONCEONLY
3850 #include "dlutils.c" /* SaveError() etc */
3856 if ($unfixable_db_file) {
3857 # Nothing we can do.
3858 } elsif (!extract_from_file('ext/DB_File/DB_File.xs',
3859 qr/^#ifdef AT_LEAST_DB_4_1$/)) {
3860 # This line is changed by commit 3245f0580c13b3ab
3861 my $line = extract_from_file('ext/DB_File/DB_File.xs',
3862 qr/^( status = \(?RETVAL->dbp->open\)?\(RETVAL->dbp, name, NULL, RETVAL->type, $)/);
3863 apply_patch(<<"EOPATCH");
3864 diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
3865 index 489ba96..fba8ded 100644
3866 --- a/ext/DB_File/DB_File.xs
3867 +++ b/ext/DB_File/DB_File.xs
3868 \@\@ -183,4 +187,8 \@\@
3871 +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
3872 +# define AT_LEAST_DB_4_1
3875 /* map version 2 features & constants onto their version 1 equivalent */
3877 \@\@ -1334,7 +1419,12 \@\@ SV * sv ;
3880 +#ifdef AT_LEAST_DB_4_1
3881 + status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL, RETVAL->type,
3887 /* printf("open returned %d %s\\n", status, db_strerror(status)) ; */
3893 if ($major < 10 and -f 'ext/IPC/SysV/SysV.xs') {
3894 edit_file('ext/IPC/SysV/SysV.xs', sub {
3896 my $fixed = <<'EOFIX';
3898 #include <sys/types.h>
3899 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
3901 # include <sys/ipc.h>
3904 # include <sys/msg.h>
3907 # if defined(PERL_SCO) || defined(PERL_ISC)
3908 # include <sys/sysmacros.h> /* SHMLBA */
3910 # include <sys/shm.h>
3911 # ifndef HAS_SHMAT_PROTOTYPE
3912 extern Shmat_t shmat (int, char *, int);
3914 # if defined(HAS_SYSCONF) && defined(_SC_PAGESIZE)
3915 # undef SHMLBA /* not static: determined at boot time */
3916 # define SHMLBA sysconf(_SC_PAGESIZE)
3917 # elif defined(HAS_GETPAGESIZE)
3918 # undef SHMLBA /* not static: determined at boot time */
3919 # define SHMLBA getpagesize()
3925 #include <sys/types\.h>
3927 (#ifdef newCONSTSUB|/\* Required)!$fixed$1!ms;
3932 if ($major >= 10 && $major < 20
3933 && !extract_from_file('ext/SDBM_File/Makefile.PL', qr/MY::subdir_x/)) {
3934 # Parallel make fix for SDBM_File
3935 # Technically this is needed for pre v5.10.0, but we don't attempt
3936 # parallel makes on earlier versions because it's unreliable due to
3938 # So far, only AIX make has come acropper on this bug.
3939 apply_commit('4d106cc5d8fd328d', 'ext/SDBM_File/Makefile.PL');
3945 return unless $fixups;
3946 foreach my $file (@$fixups) {
3947 my $fh = open_or_die($file);
3950 if ($line =~ /^#!perl\b/) {
3952 and die_255("$^X $file failed: \$!=$!, \$?=$?");
3953 } elsif ($line =~ /^#!(\/\S+)/) {
3955 and die_255("$file failed: \$!=$!, \$?=$?");
3957 if (my ($target, $action, $pattern)
3958 = $line =~ m#^(\S+) ([=!])~ /(.*)/#) {
3959 if (length $pattern) {
3960 next unless -f $target;
3961 if ($action eq '=') {
3962 next unless extract_from_file($target, $pattern);
3964 next if extract_from_file($target, $pattern);
3967 # Avoid the special case meaning of the empty pattern,
3968 # and instead use this to simply test for the file being
3970 if ($action eq '=') {
3971 next unless -f $target;
3977 system_or_die("patch -p1 <$file");
3982 # ex: set ts=8 sts=4 sw=4 et: