summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch18
-rw-r--r--meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch68
-rw-r--r--meta/recipes-devtools/automake/automake/buildtest.patch20
-rw-r--r--meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch22
-rw-r--r--meta/recipes-devtools/automake/automake/performance.patch19
-rw-r--r--meta/recipes-devtools/automake/automake/python-libdir.patch19
-rw-r--r--meta/recipes-devtools/automake/automake_1.16.1.bb (renamed from meta/recipes-devtools/automake/automake_1.15.1.bb)4
7 files changed, 82 insertions, 88 deletions
diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
index 1221f13067..deb1d03503 100644
--- a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
+++ b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
@@ -1,4 +1,4 @@
1From 25a8ac30486798d23f516722d73eb622e6264f28 Mon Sep 17 00:00:00 2001 1From b3c6e1971786cd93a2e3017c92bfbfe96baaf2f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 26 Jul 2017 11:19:56 -0700 3Date: Wed, 26 Jul 2017 11:19:56 -0700
4Subject: [PATCH] automake: Add default libtool_tag to cppasm. 4Subject: [PATCH] automake: Add default libtool_tag to cppasm.
@@ -6,19 +6,19 @@ Subject: [PATCH] automake: Add default libtool_tag to cppasm.
6 * bin/automake.in (register_language): Define default libtool tag to be CC 6 * bin/automake.in (register_language): Define default libtool tag to be CC
7 since CPPASCOMPILE is using CC to call assembler 7 since CPPASCOMPILE is using CC to call assembler
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted 9Upstream-Status: Submitted
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 11
12---
13 bin/automake.in | 1 + 13 bin/automake.in | 1 +
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16Index: automake-1.15.1/bin/automake.in 16diff --git a/bin/automake.in b/bin/automake.in
17=================================================================== 17index 3a66965..08ba09a 100644
18--- automake-1.15.1.orig/bin/automake.in 18--- a/bin/automake.in
19+++ automake-1.15.1/bin/automake.in 19+++ b/bin/automake.in
20@@ -831,6 +831,7 @@ register_language ('name' => 'cppasm', 20@@ -898,6 +898,7 @@ register_language ('name' => 'cppasm',
21 'compiler' => 'CPPASCOMPILE', 21 'libtool_tag' => 'CC',
22 'compile_flag' => '-c', 22 'compile_flag' => '-c',
23 'output_flag' => '-o', 23 'output_flag' => '-o',
24+ 'libtool_tag' => 'CC', 24+ 'libtool_tag' => 'CC',
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 @@
1From 41e06b7a354774913dcd2e32a35440e407843357 Mon Sep 17 00:00:00 2001 1From 081385f4d4bba367afad3bff1fa034f5263305e6 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
@@ -15,24 +15,24 @@ line and add "use warnings" statement.
15 15
16Upstream-Status: Pending 16Upstream-Status: Pending
17Signed-off-by: Serhii Popovych <spopovyc@cisco.com> 17Signed-off-by: Serhii Popovych <spopovyc@cisco.com>
18Signed-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
25Index: automake-1.15.1/bin/aclocal.in 25diff --git a/bin/aclocal.in b/bin/aclocal.in
26=================================================================== 26index 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;
43Index: automake-1.15.1/bin/automake.in 43diff --git a/bin/automake.in b/bin/automake.in
44=================================================================== 44index 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 {
61Index: 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 '.';
79Index: 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 '.';
diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/buildtest.patch
index c32cd1fb11..b88b9e8693 100644
--- a/meta/recipes-devtools/automake/automake/buildtest.patch
+++ b/meta/recipes-devtools/automake/automake/buildtest.patch
@@ -1,13 +1,25 @@
1From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjst@enea.com>
3Date: Wed, 19 Dec 2012 17:18:27 +0100
4Subject: [PATCH] Add a new distro feature "ptest".
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
1Split "check-TESTS" into a buildtest and runtest target, so that they can 9Split "check-TESTS" into a buildtest and runtest target, so that they can
2be run separately. 10be run separately.
3 11
4Signed-off-by: Björn Stenberg <bjst@enea.com> 12Signed-off-by: Björn Stenberg <bjst@enea.com>
5Upstream-Status: Pending 13Upstream-Status: Pending
6 14
7Index: automake-1.15.1/lib/am/check.am 15---
8=================================================================== 16 lib/am/check.am | 11 +++++++++--
9--- automake-1.15.1.orig/lib/am/check.am 17 1 file changed, 9 insertions(+), 2 deletions(-)
10+++ automake-1.15.1/lib/am/check.am 18
19diff --git a/lib/am/check.am b/lib/am/check.am
20index e0db651..de137fa 100644
21--- a/lib/am/check.am
22+++ b/lib/am/check.am
11@@ -41,7 +41,7 @@ am__tty_colors = { \ 23@@ -41,7 +41,7 @@ am__tty_colors = { \
12 fi; \ 24 fi; \
13 } 25 }
diff --git a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
index 2c6594f523..1f71722334 100644
--- a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
+++ b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
@@ -1,22 +1,32 @@
1Set relative to top_builddir path in Makefile to access test-driver 1From f78dfa39139d528c94d72f27994f337f2fd3b6bd Mon Sep 17 00:00:00 2001
2From: Adrian Calianu <adrian.calianu@enea.com>
3Date: Thu, 25 Feb 2016 16:08:04 +0100
4Subject: [PATCH] Set relative to top_builddir path in Makefile to access
5 test-driver
2 6
3Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> 7Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
4Upstream-Status: Pending 8Upstream-Status: Pending
5Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 9Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
6 10
11---
12 bin/automake.in | 9 ++++++++-
13 1 file changed, 8 insertions(+), 1 deletion(-)
14
15diff --git a/bin/automake.in b/bin/automake.in
16index a52a489..8377d20 100644
7--- a/bin/automake.in 17--- a/bin/automake.in
8+++ b/bin/automake.in 18+++ b/bin/automake.in
9@@ -272,6 +272,9 @@ 19@@ -324,6 +324,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
10 # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used 20 # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
11 # in Makefiles. 21 # in Makefiles.
12 my $am_config_aux_dir = ''; 22 my $am_config_aux_dir = '';
13+# Directory used at runtime like running test-driver that should not 23+# Directory used at runtime like running test-driver that should not
14+# depend on $(top_srcdir) 24+# depend on $(top_srcdir)
15+my $am_config_rt_aux_dir = ''; 25+my $am_config_rt_aux_dir = '';
16 26
17 # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR 27 # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
18 # in configure.ac. 28 # in configure.ac.
19@@ -4700,7 +4703,7 @@ 29@@ -4854,7 +4857,7 @@ sub handle_per_suffix_test
20 { 30 {
21 require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); 31 require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
22 define_variable ("${pfx}LOG_DRIVER", 32 define_variable ("${pfx}LOG_DRIVER",
@@ -25,7 +35,7 @@ Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
25 INTERNAL); 35 INTERNAL);
26 } 36 }
27 my $driver = '$(' . $pfx . 'LOG_DRIVER)'; 37 my $driver = '$(' . $pfx . 'LOG_DRIVER)';
28@@ -7284,6 +7287,10 @@ 38@@ -7440,6 +7443,10 @@ sub locate_aux_dir ()
29 $am_config_aux_dir = 39 $am_config_aux_dir =
30 '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); 40 '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
31 $am_config_aux_dir =~ s,/*$,,; 41 $am_config_aux_dir =~ s,/*$,,;
@@ -34,3 +44,5 @@ Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
34+ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); 44+ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
35+ $am_config_rt_aux_dir =~ s,/*$,,; 45+ $am_config_rt_aux_dir =~ s,/*$,,;
36 } 46 }
47
48
diff --git a/meta/recipes-devtools/automake/automake/performance.patch b/meta/recipes-devtools/automake/automake/performance.patch
index 3e6d5694dc..a8ba6592fa 100644
--- a/meta/recipes-devtools/automake/automake/performance.patch
+++ b/meta/recipes-devtools/automake/automake/performance.patch
@@ -1,15 +1,24 @@
1From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Mon, 7 Dec 2015 18:28:05 +0000
4Subject: [PATCH] automake: Remove delays in configure scripts using automake
5
1By default automake puts "sleep 1" into the start of configure scripts 6By default automake puts "sleep 1" into the start of configure scripts
2which adds pointless delays to them. Rather than do this, lets just assume 7which adds pointless delays to them. Rather than do this, lets just assume
3our systems are sane. 8our systems are sane.
4 9
5RP 10RP
62015/12/7 112015/12/7
7Upstream-Status: Inappropriate 12Upstream-Status: Inappropriate
8 13
9Index: automake-1.15/m4/sanity.m4 14---
10=================================================================== 15 m4/sanity.m4 | 55 -------------------------------------------------------
11--- automake-1.15.orig/m4/sanity.m4 16 1 file changed, 55 deletions(-)
12+++ automake-1.15/m4/sanity.m4 17
18diff --git a/m4/sanity.m4 b/m4/sanity.m4
19index eaac218..bfdfe88 100644
20--- a/m4/sanity.m4
21+++ b/m4/sanity.m4
13@@ -23,60 +23,5 @@ case $srcdir in 22@@ -23,60 +23,5 @@ case $srcdir in
14 AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; 23 AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
15 esac 24 esac
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
index 2a48b133eb..ee1f725f76 100644
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -1,7 +1,7 @@
1From 472a3d36c97ef7535f05d6c185edcbc22b0074c4 Mon Sep 17 00:00:00 2001 1From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001
2From: Kumar Gala <galak@kernel.crashing.org> 2From: Kumar Gala <galak@kernel.crashing.org>
3Date: Thu, 11 Aug 2011 01:26:33 -0500 3Date: Thu, 11 Aug 2011 01:26:33 -0500
4Subject: [PATCH 1/4] automake: Update for python.m4 to respect libdir 4Subject: [PATCH] automake: Update for python.m4 to respect libdir
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7 7
@@ -17,10 +17,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
17 1 file changed, 7 insertions(+), 20 deletions(-) 17 1 file changed, 7 insertions(+), 20 deletions(-)
18 18
19diff --git a/m4/python.m4 b/m4/python.m4 19diff --git a/m4/python.m4 b/m4/python.m4
20index 5b2c695..ed19261 100644 20index 63c0a0e..7bbd2d2 100644
21--- a/m4/python.m4 21--- a/m4/python.m4
22+++ b/m4/python.m4 22+++ b/m4/python.m4
23@@ -91,12 +91,13 @@ AC_DEFUN([AM_PATH_PYTHON], 23@@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON],
24 [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) 24 [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
25 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) 25 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
26 26
@@ -36,7 +36,7 @@ index 5b2c695..ed19261 100644
36 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) 36 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
37 37
38 dnl At times (like when building shared libraries) you may want 38 dnl At times (like when building shared libraries) you may want
39@@ -141,14 +142,7 @@ except ImportError: 39@@ -144,14 +145,7 @@ except ImportError:
40 else 40 else
41 am_py_prefix=$prefix 41 am_py_prefix=$prefix
42 fi 42 fi
@@ -52,7 +52,7 @@ index 5b2c695..ed19261 100644
52 case $am_cv_python_pythondir in 52 case $am_cv_python_pythondir in
53 $am_py_prefix*) 53 $am_py_prefix*)
54 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` 54 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
55@@ -158,7 +152,7 @@ sys.stdout.write(sitedir)"` 55@@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"`
56 case $am_py_prefix in 56 case $am_py_prefix in
57 /usr|/System*) ;; 57 /usr|/System*) ;;
58 *) 58 *)
@@ -61,7 +61,7 @@ index 5b2c695..ed19261 100644
61 ;; 61 ;;
62 esac 62 esac
63 ;; 63 ;;
64@@ -183,14 +177,7 @@ sys.stdout.write(sitedir)"` 64@@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"`
65 else 65 else
66 am_py_exec_prefix=$exec_prefix 66 am_py_exec_prefix=$exec_prefix
67 fi 67 fi
@@ -77,7 +77,7 @@ index 5b2c695..ed19261 100644
77 case $am_cv_python_pyexecdir in 77 case $am_cv_python_pyexecdir in
78 $am_py_exec_prefix*) 78 $am_py_exec_prefix*)
79 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` 79 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
80@@ -200,7 +187,7 @@ sys.stdout.write(sitedir)"` 80@@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"`
81 case $am_py_exec_prefix in 81 case $am_py_exec_prefix in
82 /usr|/System*) ;; 82 /usr|/System*) ;;
83 *) 83 *)
@@ -86,6 +86,3 @@ index 5b2c695..ed19261 100644
86 ;; 86 ;;
87 esac 87 esac
88 ;; 88 ;;
89--
902.8.1
91
diff --git a/meta/recipes-devtools/automake/automake_1.15.1.bb b/meta/recipes-devtools/automake/automake_1.16.1.bb
index 4f9b616b66..c64ee44d90 100644
--- a/meta/recipes-devtools/automake/automake_1.15.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.16.1.bb
@@ -27,8 +27,8 @@ SRC_URI += "file://python-libdir.patch \
27 file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ 27 file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \
28 " 28 "
29 29
30SRC_URI[md5sum] = "95df3f2d6eb8f81e70b8cb63a93c8853" 30SRC_URI[md5sum] = "83cc2463a4080efd46a72ba2c9f6b8f5"
31SRC_URI[sha256sum] = "988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260" 31SRC_URI[sha256sum] = "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
32 32
33PERL = "${USRBINPATH}/perl" 33PERL = "${USRBINPATH}/perl"
34PERL_class-native = "${USRBINPATH}/env perl" 34PERL_class-native = "${USRBINPATH}/env perl"