diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-07-12 03:15:26 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:38 +0100 |
commit | dbe04cb1107f95ce6a675ad780995a9d215e70a7 (patch) | |
tree | d63c21fa96788504ff593513e3b4ded662c25d2c /meta/recipes-devtools/automake | |
parent | 157e7a244a70c1812c99bb4a82d78067b4819e6b (diff) | |
download | poky-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')
-rw-r--r-- | meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.15.1.bb (renamed from meta/recipes-devtools/automake/automake_1.15.bb) | 5 |
2 files changed, 2 insertions, 35 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 @@ | |||
1 | From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Thu, 31 Mar 2016 16:35:29 -0700 | ||
4 | Subject: [PATCH] automake: port to Perl 5.22 and later | ||
5 | |||
6 | Without this change, Perl 5.22 complains "Unescaped left brace in | ||
7 | regex is deprecated" and this is planned to become a hard error in | ||
8 | Perl 5.26. See: | ||
9 | http://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 | |||
12 | Upstream-Status: Backport [13f00eb4493c217269b76614759e452d8302955e] | ||
13 | --- | ||
14 | bin/automake.in | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/bin/automake.in b/bin/automake.in | ||
18 | index 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 | -- | ||
31 | 2.11.0 | ||
32 | |||
diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.1.bb index 902dd63db1..481234185e 100644 --- a/meta/recipes-devtools/automake/automake_1.15.bb +++ b/meta/recipes-devtools/automake/automake_1.15.1.bb | |||
@@ -24,11 +24,10 @@ 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 \ | ||
28 | " | 27 | " |
29 | 28 | ||
30 | SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" | 29 | SRC_URI[md5sum] = "95df3f2d6eb8f81e70b8cb63a93c8853" |
31 | SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" | 30 | SRC_URI[sha256sum] = "988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260" |
32 | 31 | ||
33 | PERL = "${USRBINPATH}/perl" | 32 | PERL = "${USRBINPATH}/perl" |
34 | PERL_class-native = "${USRBINPATH}/env perl" | 33 | PERL_class-native = "${USRBINPATH}/env perl" |