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>
This commit is contained in:
parent
91cee06433
commit
4ba0cc04af
|
@ -0,0 +1,32 @@
|
||||||
|
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.
|
||||||
|
|
||||||
|
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
|
||||||
|
|
|
@ -24,6 +24,7 @@ SRC_URI += "file://python-libdir.patch \
|
||||||
file://performance.patch \
|
file://performance.patch \
|
||||||
file://new_rt_path_for_test-driver.patch \
|
file://new_rt_path_for_test-driver.patch \
|
||||||
file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \
|
file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \
|
||||||
|
file://0001-automake-port-to-Perl-5.22-and-later.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"
|
SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"
|
||||||
|
|
Loading…
Reference in New Issue