>From 499c844cf49ac8b0e25a700639de9c288d25575b Mon Sep 17 00:00:00 2001 From: Anton Novikov Date: Tue, 20 Jun 2017 14:33:20 +0300 Subject: [PATCH] add perl regex fix for Automake Build was failing on Arch Linux due to recent Perl giving error on unescaped curly braces. Patch fixing it was copied from Arch Build System. Signed-off-by: Anton Novikov --- .../automake/automake/perl-regex-curly.patch | 26 ++++++++++++++++++++++ meta/recipes-devtools/automake/automake_1.15.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-devtools/automake/automake/perl-regex-curly.patch diff --git a/meta/recipes-devtools/automake/automake/perl-regex-curly.patch b/meta/recipes-devtools/automake/automake/perl-regex-curly.patch new file mode 100644 index 0000000000..20cb96b74b --- /dev/null +++ b/meta/recipes-devtools/automake/automake/perl-regex-curly.patch @@ -0,0 +1,26 @@ +From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 31 Mar 2016 23:35:29 +0000 +Subject: 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. +--- +diff --git a/bin/automake.in b/bin/automake.in +index a3a0aa3..2c8f31e 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; + } + +-- +cgit v0.9.0.2 diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.bb index 902dd63db1..0046cd4f0f 100644 --- a/meta/recipes-devtools/automake/automake_1.15.bb +++ b/meta/recipes-devtools/automake/automake_1.15.bb @@ -22,6 +22,7 @@ RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf" SRC_URI += "file://python-libdir.patch \ file://buildtest.patch \ file://performance.patch \ + file://perl-regex-curly.patch \ file://new_rt_path_for_test-driver.patch \ file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ file://0001-automake-port-to-Perl-5.22-and-later.patch \ -- 2.13.1