From 6455aa2289a401ab4959b399acada02907be99be Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 12 Jul 2017 03:15:26 -0700 Subject: automake: 1.15 -> 1.15.1 * Remove backported patch: - 0001-automake-port-to-Perl-5.22-and-later.patch Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- ...0001-automake-port-to-Perl-5.22-and-later.patch | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch (limited to 'meta/recipes-devtools/automake/automake') diff --git a/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch b/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch deleted file mode 100644 index 0e6895fb4b..0000000000 --- a/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -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. - -Upstream-Status: Backport [13f00eb4493c217269b76614759e452d8302955e] ---- - 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.11.0 - -- cgit 1.2.3-korg