This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
bisect-runner.pl now fixes another 5.11-era parallel make bug.
authorNicholas Clark <nick@ccl4.org>
Mon, 21 Nov 2011 17:20:02 +0000 (17:20 +0000)
committerNicholas Clark <nick@ccl4.org>
Tue, 22 Nov 2011 08:47:12 +0000 (08:47 +0000)
Emulate commit 2b63e250843b907e, by correcting Makefile.SH to correctly
describe the relationship between git_version.h, lib/Config_git.pl and
running make_patchnum.pl

Porting/bisect-runner.pl

index df36968..4c67a86 100755 (executable)
@@ -1742,6 +1742,19 @@ perlmini\$(OBJ_EXT): git_version.h
 
 lib/Config_git.pl:}m;
                               }
+                              # Right, now we've corrected Makefile.SH to
+                              # correctly describe how lib/Config_git.pl and
+                              # git_version.h are made, we need to fix the rest
+
+                              # This emulates commit 2b63e250843b907e
+                              # This might duplicate the rule stating that
+                              # git_version.h depends on lib/Config_git.pl
+                              # This is harmless.
+                              $code =~ s{^(?:lib/Config_git\.pl )?git_version\.h: (.* make_patchnum\.pl.*)}
+                                        {git_version.h: lib/Config_git.pl
+
+lib/Config_git.pl: $1}m;
+
                               return $code;
                           });
             }