diff options
author | Mike Frysinger <vapier@gentoo.org> | 2015-12-16 17:49:26 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-16 17:52:38 -0500 |
commit | 397ebbd25aa13b7e2e54b247c230d4e7c29acfdf (patch) | |
tree | 7bd3acec693e7caf58d1c0a8246083bb72fc421d /sys-devel/automake/files | |
parent | sys-devel/automake-wrapper: drop versions <10 (diff) | |
download | gentoo-397ebbd25aa13b7e2e54b247c230d4e7c29acfdf.tar.gz gentoo-397ebbd25aa13b7e2e54b247c230d4e7c29acfdf.tar.bz2 gentoo-397ebbd25aa13b7e2e54b247c230d4e7c29acfdf.zip |
sys-devel/automake: fix version warning w/newer perl
Diffstat (limited to 'sys-devel/automake/files')
-rw-r--r-- | sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch | 37 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch | 37 |
2 files changed, 74 insertions, 0 deletions
diff --git a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch new file mode 100644 index 000000000000..a113d09c58c6 --- /dev/null +++ b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket.patch @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables ($) + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.1.0 + diff --git a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch new file mode 100644 index 000000000000..268548d1e9de --- /dev/null +++ b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.1.0 + |