From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Sun, 13 Nov 2005 16:00:49 +0000 (-0800)
Subject: consting perlbug breaking in blead & maint
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=548074dfae7ec3070e1e05e09a994816bd8d5f53;p=p5sagit%2Fp5-mst-13.2.git

consting perlbug breaking in blead & maint
Message-ID: <20051114000049.GA7676@efn.org>

p4raw-id: //depot/perl@26118
---

diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index c778c9c..8e64828 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -28,9 +28,15 @@ open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
     or die "Can't open patchlevel.h: $!";
 
 my $patchlevel_date = (stat PATCH_LEVEL)[9];
+my $patchnum = "";
 
 while (<PATCH_LEVEL>) {
-    last if $_ =~ /^\s*static\s+char.*?local_patches\[\]\s*=\s*{\s*$/;
+    $patchnum = $1 if /#define PERL_PATCHNUM\s+(\d+)/;
+    last if $_ =~ /^\s*static\s+(?:const\s+)?char.*?local_patches\[\]\s*=\s*{\s*$/;
+}
+
+if (! defined($_)) {
+    warn "Warning: local_patches section not found in patchlevel.h\n";
 }
 
 my @patches;
@@ -38,6 +44,7 @@ while (<PATCH_LEVEL>) {
     last if /^\s*}/;
     chomp;
     s/^\s+,?\s*"?//;
+    s/"\s+STRINGIFY\(PERL_PATCHNUM\)/$patchnum"/;
     s/"?\s*,?$//;
     s/(['\\])/\\$1/g;
     push @patches, $_ unless $_ eq 'NULL';