a18cae3c34
This patch fix only troubles with git send mail. Based on upstream commit: 8d66b3f930dc6d88b524d103e304308ae73a46e7
83 lines
2.8 KiB
Diff
83 lines
2.8 KiB
Diff
diff -up perl-5.12.2/lib/h2ph.t.bug perl-5.12.2/lib/h2ph.t
|
|
--- perl-5.12.2/lib/h2ph.t.bug 2010-09-07 01:30:32.000000000 +0200
|
|
+++ perl-5.12.2/lib/h2ph.t 2010-10-20 16:52:07.000000000 +0200
|
|
@@ -41,9 +41,16 @@ $result = runperl( progfile => 'lib/h2ph
|
|
stderr => 1 );
|
|
like( $result, qr/syntax OK$/, "output compiles");
|
|
|
|
+$result = runperl( progfile => '_h2ph_pre.ph',
|
|
+ switches => ['-c'],
|
|
+ stderr => 1 );
|
|
+like( $result, qr/syntax OK$/, "preamble compiles");
|
|
+
|
|
$result = runperl( switches => ["-w"],
|
|
- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
|
|
-is( $result, '', "output free of warnings" );
|
|
+ stderr => 1,
|
|
+ prog => <<'PROG' );
|
|
+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
|
|
+PROG
|
|
|
|
# cleanup
|
|
END {
|
|
diff -up perl-5.12.2/utils/h2ph.PL.bug perl-5.12.2/utils/h2ph.PL
|
|
--- perl-5.12.2/utils/h2ph.PL.bug 2010-09-07 01:30:32.000000000 +0200
|
|
+++ perl-5.12.2/utils/h2ph.PL 2010-10-20 16:49:33.000000000 +0200
|
|
@@ -401,7 +401,11 @@ if ($opt_e && (scalar(keys %bad_file) >
|
|
exit $Exit;
|
|
|
|
sub expr {
|
|
- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
|
|
+ if (/\b__asm__\b/) { # freak out
|
|
+ $new = '"(assembly code)"';
|
|
+ return
|
|
+ }
|
|
+
|
|
my $joined_args;
|
|
if(keys(%curargs)) {
|
|
$joined_args = join('|', keys(%curargs));
|
|
@@ -770,7 +774,7 @@ sub inc_dirs
|
|
sub build_preamble_if_necessary
|
|
{
|
|
# Increment $VERSION every time this function is modified:
|
|
- my $VERSION = 2;
|
|
+ my $VERSION = 3;
|
|
my $preamble = "$Dest_dir/_h2ph_pre.ph";
|
|
|
|
# Can we skip building the preamble file?
|
|
@@ -798,7 +802,16 @@ sub build_preamble_if_necessary
|
|
# parenthesized value: d=(v)
|
|
$define{$_} = $1;
|
|
}
|
|
- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
|
|
+ if (/^(\w+)\((\w)\)$/) {
|
|
+ my($macro, $arg) = ($1, $2);
|
|
+ my $def = $define{$_};
|
|
+ $def =~ s/$arg/\$\{$arg\}/g;
|
|
+ print PREAMBLE <<DEFINE;
|
|
+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
|
|
+
|
|
+DEFINE
|
|
+ } elsif
|
|
+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
|
|
# float:
|
|
print PREAMBLE
|
|
"unless (defined &$_) { sub $_() { $1 } }\n\n";
|
|
@@ -807,8 +820,14 @@ sub build_preamble_if_necessary
|
|
print PREAMBLE
|
|
"unless (defined &$_) { sub $_() { $1 } }\n\n";
|
|
} elsif ($define{$_} =~ /^\w+$/) {
|
|
- print PREAMBLE
|
|
- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
|
|
+ my $def = $define{$_};
|
|
+ if ($isatype{$def}) {
|
|
+ print PREAMBLE
|
|
+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
|
|
+ } else {
|
|
+ print PREAMBLE
|
|
+ "unless (defined &$_) { sub $_() { &$def } }\n\n";
|
|
+ }
|
|
} else {
|
|
print PREAMBLE
|
|
"unless (defined &$_) { sub $_() { \"",
|