Magellan Linux

Contents of /trunk/automake/patches/automake-1.13-perl-5.26.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2975 - (show annotations) (download)
Wed Aug 23 11:15:15 2017 UTC (6 years, 8 months ago) by niro
File size: 1135 byte(s)
-aded perl-5.26 patches
1 http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
2
3 From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
4 From: Pavel Raiskup <praiskup@redhat.com>
5 Date: Tue, 7 Jul 2015 10:54:24 +0200
6 Subject: [PATCH] bin/automake: escape '{' in regexp pattern
7
8 Based on perlre(1) documentation:
9 .. in Perl v5.26, literal uses of a curly bracket will be required
10 to be escaped, say by preceding them with a backslash ("\{" ) or
11 enclosing them within square brackets ("[{]") ..
12
13 References:
14 https://bugzilla.redhat.com/1239379
15
16 * bin/automake.in (substitute_ac_subst_variables): Escape the
17 occurrence of '{' character.
18 ---
19 bin/automake.in | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 diff --git a/bin/automake.in b/bin/automake.in
23 index 0c29184..c294ced 100644
24 --- a/bin/automake.in
25 +++ b/bin/automake.in
26 @@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
27 sub substitute_ac_subst_variables ($)
28 {
29 my ($text) = @_;
30 - $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
31 + $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
32 return $text;
33 }
34
35 --
36 2.1.0
37