summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2017-06-13 13:39:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:56:49 (GMT)
commit4ba0cc04af911271b7020d0a4f52182cb4bea19e (patch)
treec673aa8505bf69907dc3b2980f6f553b763054bb
parent91cee064332969207334cd1ee5c31d02610281fc (diff)
downloadpoky-4ba0cc04af911271b7020d0a4f52182cb4bea19e.tar.gz
automake: Backport perl 5.22 fix
Backport 13f00eb4493c "automake: port to Perl 5.22 and later" from automake upstream to fix build with perl 5.22 . (From OE-Core rev: ab0e298ec2c155739565f1cde76639855ba7bba0) Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch32
-rw-r--r--meta/recipes-devtools/automake/automake_1.15.bb1
2 files changed, 33 insertions, 0 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
new file mode 100644
index 0000000..0e6895f
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch
@@ -0,0 +1,32 @@
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
diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.bb
index a6904c8..902dd63 100644
--- a/meta/recipes-devtools/automake/automake_1.15.bb
+++ b/meta/recipes-devtools/automake/automake_1.15.bb
@@ -24,6 +24,7 @@ SRC_URI += "file://python-libdir.patch \
24 file://performance.patch \ 24 file://performance.patch \
25 file://new_rt_path_for_test-driver.patch \ 25 file://new_rt_path_for_test-driver.patch \
26 file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ 26 file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \
27 file://0001-automake-port-to-Perl-5.22-and-later.patch \
27 " 28 "
28 29
29SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" 30SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"