diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-11-20 16:53:47 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-11-22 08:47:12 +0000 |
| commit | c0960282fc255b6f6d19f6bfde54bc6c110509f1 (patch) | |
| tree | 5544e8161f673d02ca1690ba3d4876f99934ec2b | |
| parent | 9a82c944a90fc4b97811a7c5f18e227eb2775c8a (diff) | |
| download | perl-c0960282fc255b6f6d19f6bfde54bc6c110509f1.tar.gz | |
bisect-runner.pl now fixes some 5.11-era parallel make bugs.
bisect-runner.pl now patches Makefile.SH with correct dependencies for the
first iteration of incorporating the git version in perl -V output by
writing the files .patchnum or unpushed.h.
This era is important because contains the commit that merges Schwern's y2038
work, which is likely to be significant for some testcases.
| -rwxr-xr-x | Porting/bisect-runner.pl | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index fea722b32f..ffcb2853cc 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -1634,6 +1634,61 @@ index f61d0db..6097954 100644 EOPATCH } + + if ($major == 11) { + if (extract_from_file('patchlevel.h', + qr/^#include "unpushed\.h"/)) { + # I had thought it easier to detect when building one of the 52 + # commits with the original method of incorporating the git + # revision and drop parallel make flags. Commits shown by + # git log 46807d8e809cc127^..dcff826f70bf3f64^ ^d4fb0a1f15d1a1c4 + # However, it's not actually possible to make miniperl for that + # configuration as-is, because the file .patchnum is only made + # as a side effect of target 'all' + # I also don't think that it's "safe" to simply run + # make_patchnum.sh before the build. We need the proper + # dependency rules in the Makefile to *stop* it being run again + # at the wrong time. + # This range is important because contains the commit that + # merges Schwern's y2038 work. + apply_patch(<<'EOPATCH'); +diff --git a/Makefile.SH b/Makefile.SH +index 9ad8b6f..106e721 100644 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -540,9 +544,14 @@ sperl.i: perl.c $(h) + + .PHONY: all translators utilities make_patchnum + +-make_patchnum: ++make_patchnum: lib/Config_git.pl ++ ++lib/Config_git.pl: make_patchnum.sh + sh $(shellflags) make_patchnum.sh + ++# .patchnum, unpushed.h and lib/Config_git.pl are built by make_patchnum.sh ++unpushed.h .patchnum: lib/Config_git.pl ++ + # make sure that we recompile perl.c if .patchnum changes + perl$(OBJ_EXT): .patchnum unpushed.h + +EOPATCH + } elsif (-f '.gitignore' + && extract_from_file('.gitignore', qr/^\.patchnum$/)) { + # 8565263ab8a47cda to 46807d8e809cc127^ inclusive. + edit_file('Makefile.SH', sub { + my $code = shift; + $code =~ s/^make_patchnum:\n/make_patchnum: .patchnum + +.sha1: .patchnum + +.patchnum: make_patchnum.sh +/m; + return $code; + }); + } + } + if ($major < 14) { # Commits dc0655f797469c47 and d11a62fe01f2ecb2 edit_file('Makefile.SH', sub { |