diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-07-03 12:11:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 00:22:08 +0100 |
commit | 4604255985ebdc03d159bea66ecb527b993a585e (patch) | |
tree | 58fcbf01049532f8597b61a647902a5caf7eeaf1 /meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch | |
parent | bf760b5d9d00bfa7d3d98b5aedac478707c7315d (diff) | |
download | poky-4604255985ebdc03d159bea66ecb527b993a585e.tar.gz |
automake: 1.15.1 -> 1.16.1
* Refreshed the following patches:
- 0001-automake-Add-default-libtool_tag-to-cppasm.patch
- automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
- buildtest.patch
- new_rt_path_for_test-driver.patch
- performance.patch
- python-libdir.patch
(From OE-Core rev: f63a493298de7d0cac36a65dafba5dae06c06a05)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch | 68 |
1 files changed, 16 insertions, 52 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 96b5a3d6b2..1592c02cb9 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 @@ | |||
1 | From 41e06b7a354774913dcd2e32a35440e407843357 Mon Sep 17 00:00:00 2001 | 1 | From 081385f4d4bba367afad3bff1fa034f5263305e6 Mon Sep 17 00:00:00 2001 |
2 | From: Serhii Popovych <spopovyc@cisco.com> | 2 | From: Serhii Popovych <spopovyc@cisco.com> |
3 | Date: Wed, 10 Feb 2016 17:07:32 +0000 | 3 | Date: Wed, 10 Feb 2016 17:07:32 +0000 |
4 | Subject: [PATCH] perl: Replace -w option in shebangs with modern "use | 4 | Subject: [PATCH] perl: Replace -w option in shebangs with modern "use |
@@ -15,24 +15,24 @@ line and add "use warnings" statement. | |||
15 | 15 | ||
16 | Upstream-Status: Pending | 16 | Upstream-Status: Pending |
17 | Signed-off-by: Serhii Popovych <spopovyc@cisco.com> | 17 | Signed-off-by: Serhii Popovych <spopovyc@cisco.com> |
18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
19 | |||
18 | --- | 20 | --- |
19 | bin/aclocal.in | 3 ++- | 21 | bin/aclocal.in | 3 ++- |
20 | bin/automake.in | 3 ++- | 22 | bin/automake.in | 3 ++- |
21 | t/wrap/aclocal.in | 3 ++- | 23 | 2 files changed, 4 insertions(+), 2 deletions(-) |
22 | t/wrap/automake.in | 3 ++- | ||
23 | 4 files changed, 8 insertions(+), 4 deletions(-) | ||
24 | 24 | ||
25 | Index: automake-1.15.1/bin/aclocal.in | 25 | diff --git a/bin/aclocal.in b/bin/aclocal.in |
26 | =================================================================== | 26 | index b3715d9..461d453 100644 |
27 | --- automake-1.15.1.orig/bin/aclocal.in | 27 | --- a/bin/aclocal.in |
28 | +++ automake-1.15.1/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 | # -*- perl -*- |
33 | # @configure_input@ | 33 | # @configure_input@ |
34 | 34 | ||
35 | @@ -33,6 +33,7 @@ BEGIN | 35 | @@ -32,6 +32,7 @@ BEGIN |
36 | } | 36 | } |
37 | 37 | ||
38 | use strict; | 38 | use strict; |
@@ -40,17 +40,17 @@ Index: automake-1.15.1/bin/aclocal.in | |||
40 | 40 | ||
41 | use Automake::Config; | 41 | use Automake::Config; |
42 | use Automake::General; | 42 | use Automake::General; |
43 | Index: automake-1.15.1/bin/automake.in | 43 | diff --git a/bin/automake.in b/bin/automake.in |
44 | =================================================================== | 44 | index 8377d20..3a66965 100644 |
45 | --- automake-1.15.1.orig/bin/automake.in | 45 | --- a/bin/automake.in |
46 | +++ automake-1.15.1/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 | # -*- perl -*- |
51 | # @configure_input@ | 51 | # @configure_input@ |
52 | 52 | ||
53 | @@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; | 53 | @@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' |
54 | package Automake; | 54 | package Automake; |
55 | 55 | ||
56 | use strict; | 56 | use strict; |
@@ -58,39 +58,3 @@ Index: automake-1.15.1/bin/automake.in | |||
58 | 58 | ||
59 | BEGIN | 59 | BEGIN |
60 | { | 60 | { |
61 | Index: automake-1.15.1/t/wrap/aclocal.in | ||
62 | =================================================================== | ||
63 | --- automake-1.15.1.orig/t/wrap/aclocal.in | ||
64 | +++ automake-1.15.1/t/wrap/aclocal.in | ||
65 | @@ -1,4 +1,4 @@ | ||
66 | -#!@PERL@ -w | ||
67 | +#!@PERL@ | ||
68 | # @configure_input@ | ||
69 | |||
70 | # Copyright (C) 2012-2017 Free Software Foundation, Inc. | ||
71 | @@ -19,6 +19,7 @@ | ||
72 | BEGIN | ||
73 | { | ||
74 | use strict; | ||
75 | + use warnings; | ||
76 | @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib'); | ||
77 | unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib' | ||
78 | if '@srcdir@' ne '.'; | ||
79 | Index: automake-1.15.1/t/wrap/automake.in | ||
80 | =================================================================== | ||
81 | --- automake-1.15.1.orig/t/wrap/automake.in | ||
82 | +++ automake-1.15.1/t/wrap/automake.in | ||
83 | @@ -1,4 +1,4 @@ | ||
84 | -#!@PERL@ -w | ||
85 | +#!@PERL@ | ||
86 | # @configure_input@ | ||
87 | |||
88 | # Copyright (C) 2012-2017 Free Software Foundation, Inc. | ||
89 | @@ -19,6 +19,7 @@ | ||
90 | BEGIN | ||
91 | { | ||
92 | use strict; | ||
93 | + use warnings; | ||
94 | @Automake::perl_libdirs = ('@abs_top_srcdir@/lib'); | ||
95 | unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib' | ||
96 | if '@srcdir@' ne '.'; | ||