This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
bisect-runner.pl now fixes more 5.11-era parallel make bugs.
authorNicholas Clark <nick@ccl4.org>
Sun, 20 Nov 2011 19:03:35 +0000 (19:03 +0000)
committerNicholas Clark <nick@ccl4.org>
Tue, 22 Nov 2011 08:47:12 +0000 (08:47 +0000)
Backport two of the bugfixes from commit 0f13ebd5d71f8177 into earlier
revisions. Avoid running autodoc.pl or ./generate_uudmap more than once.

Porting/bisect-runner.pl

index ffcb285..fdf68cd 100755 (executable)
@@ -1686,6 +1686,24 @@ EOPATCH
 /m;
                               return $code;
                           });
+            } elsif (-f 'lib/.gitignore'
+                     && extract_from_file('lib/.gitignore',
+                                          qr!^/Config_git.pl!)
+                     && !extract_from_file('Makefile.SH',
+                                        qr/^uudmap\.h.*:bitcount.h$/)) {
+                # Between commits and dcff826f70bf3f64 and 0f13ebd5d71f8177^
+                edit_file('Makefile.SH', sub {
+                              my $code = shift;
+                              # Bug introduced by 344af494c35a9f0f
+                              # fixed in 0f13ebd5d71f8177
+                              $code =~ s{^(pod/perlapi\.pod) (pod/perlintern\.pod): }
+                                        {$1: $2\n\n$2: }m;
+                              # Bug introduced by efa50c51e3301a2c
+                              # fixed in 0f13ebd5d71f8177
+                              $code =~ s{^(uudmap\.h) (bitcount\.h): }
+                                        {$1: $2\n\n$2: }m;
+                              return $code;
+                          });
             }
         }