summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/automake/automake
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-12 03:15:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commitdbe04cb1107f95ce6a675ad780995a9d215e70a7 (patch)
treed63c21fa96788504ff593513e3b4ded662c25d2c /meta/recipes-devtools/automake/automake
parent157e7a244a70c1812c99bb4a82d78067b4819e6b (diff)
downloadpoky-dbe04cb1107f95ce6a675ad780995a9d215e70a7.tar.gz
automake: 1.15 -> 1.15.1
* Remove backported patch: - 0001-automake-port-to-Perl-5.22-and-later.patch (From OE-Core rev: 6455aa2289a401ab4959b399acada02907be99be) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/automake/automake')
-rw-r--r--meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch32
1 files changed, 0 insertions, 32 deletions
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 @@
1From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001
2From: Paul Eggert <eggert@cs.ucla.edu>
3Date: Thu, 31 Mar 2016 16:35:29 -0700
4Subject: [PATCH] automake: port to Perl 5.22 and later
5
6Without this change, Perl 5.22 complains "Unescaped left brace in
7regex is deprecated" and this is planned to become a hard error in
8Perl 5.26. See:
9http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern
10* bin/automake.in (substitute_ac_subst_variables): Escape left brace.
11
12Upstream-Status: Backport [13f00eb4493c217269b76614759e452d8302955e]
13---
14 bin/automake.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/bin/automake.in b/bin/automake.in
18index a3a0aa318..2c8f31e14 100644
19--- a/bin/automake.in
20+++ b/bin/automake.in
21@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
22 sub substitute_ac_subst_variables
23 {
24 my ($text) = @_;
25- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
26+ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
27 return $text;
28 }
29
30--
312.11.0
32