diff options
author | Thomas Langer <thomas.langer.71@gmail.com> | 2017-06-27 18:26:28 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-04 22:56:55 +0200 |
commit | eafaef3765152526e29a18329900b9ba39eae3bb (patch) | |
tree | b7b1fce47908aabd33bd5b3a426f0b508c2ded15 /tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch | |
parent | 0825de2df7b7a13e5185140e1a5c0318aa16afe4 (diff) | |
download | upstream-eafaef3765152526e29a18329900b9ba39eae3bb.tar.gz upstream-eafaef3765152526e29a18329900b9ba39eae3bb.tar.bz2 upstream-eafaef3765152526e29a18329900b9ba39eae3bb.zip |
automake: Update to version 1.15.1
The new version includes the fix for new perl versions,
so remove the related patch.
Signed-off-by: Thomas Langer <thomas.langer.71@gmail.com>
Diffstat (limited to 'tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch')
-rw-r--r-- | tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch b/tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch deleted file mode 100644 index 31b9273d54..0000000000 --- a/tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 31 Mar 2016 16:35:29 -0700 -Subject: [PATCH] automake: port to Perl 5.22 and later - -Without this change, Perl 5.22 complains "Unescaped left brace in -regex is deprecated" and this is planned to become a hard error in -Perl 5.26. See: -http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern -* bin/automake.in (substitute_ac_subst_variables): Escape left brace. ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index a3a0aa318..2c8f31e14 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -3878,7 +3878,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.13.1 - |