summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit7cad5628a081776b97e6afab488c2ab8d97ebb0c (patch)
tree4f87f98b0c40694bd5fc844f53957dfee13aace1
parent5df6dc44370c446c699007659782323814a4d9ce (diff)
downloadpoky-7cad5628a081776b97e6afab488c2ab8d97ebb0c.tar.gz
automake: 1.16.1 -> 1.16.2
(From OE-Core rev: 70db6675aabdda6465912a1c1f7a2a7391201517) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch18
-rw-r--r--meta/recipes-devtools/automake/automake_1.16.2.bb (renamed from meta/recipes-devtools/automake/automake_1.16.1.bb)4
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
index 1592c02cb9..0e84c4bf86 100644
--- a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
+++ b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
@@ -1,4 +1,4 @@
1From 081385f4d4bba367afad3bff1fa034f5263305e6 Mon Sep 17 00:00:00 2001 1From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001
2From: Serhii Popovych <spopovyc@cisco.com> 2From: Serhii Popovych <spopovyc@cisco.com>
3Date: Wed, 10 Feb 2016 17:07:32 +0000 3Date: Wed, 10 Feb 2016 17:07:32 +0000
4Subject: [PATCH] perl: Replace -w option in shebangs with modern "use 4Subject: [PATCH] perl: Replace -w option in shebangs with modern "use
@@ -23,16 +23,16 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
23 2 files changed, 4 insertions(+), 2 deletions(-) 23 2 files changed, 4 insertions(+), 2 deletions(-)
24 24
25diff --git a/bin/aclocal.in b/bin/aclocal.in 25diff --git a/bin/aclocal.in b/bin/aclocal.in
26index b3715d9..461d453 100644 26index 9a20325..bd185d4 100644
27--- a/bin/aclocal.in 27--- a/bin/aclocal.in
28+++ b/bin/aclocal.in 28+++ b/bin/aclocal.in
29@@ -1,4 +1,4 @@ 29@@ -1,4 +1,4 @@
30-#!@PERL@ -w 30-#!@PERL@ -w
31+#!@PERL@ 31+#!@PERL@
32 # -*- perl -*- 32 # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*-
33 # @configure_input@ 33 # @configure_input@
34 34 # Copyright (C) 1996-2020 Free Software Foundation, Inc.
35@@ -32,6 +32,7 @@ BEGIN 35@@ -26,6 +26,7 @@ BEGIN
36 } 36 }
37 37
38 use strict; 38 use strict;
@@ -41,16 +41,16 @@ index b3715d9..461d453 100644
41 use Automake::Config; 41 use Automake::Config;
42 use Automake::General; 42 use Automake::General;
43diff --git a/bin/automake.in b/bin/automake.in 43diff --git a/bin/automake.in b/bin/automake.in
44index 8377d20..3a66965 100644 44index 5ed404a..d387b8e 100644
45--- a/bin/automake.in 45--- a/bin/automake.in
46+++ b/bin/automake.in 46+++ b/bin/automake.in
47@@ -1,4 +1,4 @@ 47@@ -1,4 +1,4 @@
48-#!@PERL@ -w 48-#!@PERL@ -w
49+#!@PERL@ 49+#!@PERL@
50 # -*- perl -*- 50 # automake - create Makefile.in from Makefile.am -*- perl -*-
51 # @configure_input@ 51 # @configure_input@
52 52 # Copyright (C) 1994-2020 Free Software Foundation, Inc.
53@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' 53@@ -23,6 +23,7 @@
54 package Automake; 54 package Automake;
55 55
56 use strict; 56 use strict;
diff --git a/meta/recipes-devtools/automake/automake_1.16.1.bb b/meta/recipes-devtools/automake/automake_1.16.2.bb
index d82eed3c60..fd8ed0ed3b 100644
--- a/meta/recipes-devtools/automake/automake_1.16.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.16.2.bb
@@ -28,8 +28,8 @@ SRC_URI += "file://python-libdir.patch \
28 file://0001-build-fix-race-in-parallel-builds.patch \ 28 file://0001-build-fix-race-in-parallel-builds.patch \
29 " 29 "
30 30
31SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5" 31SRC_URI[md5sum] = "f1a14f2ab2b0fb861a011e1d94e589e0"
32SRC_URI[sha256sum] = "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8" 32SRC_URI[sha256sum] = "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1"
33 33
34PERL = "${USRBINPATH}/perl" 34PERL = "${USRBINPATH}/perl"
35PERL_class-native = "${USRBINPATH}/env perl" 35PERL_class-native = "${USRBINPATH}/env perl"