diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake')
5 files changed, 119 insertions, 149 deletions
diff --git a/meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch b/meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch new file mode 100644 index 0000000000..f72788c3a6 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch @@ -0,0 +1,35 @@ +From bed646918bc67e9e2151ccbda03aae34717821fe Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei.gherzan@huawei.com> +Date: Wed, 20 Apr 2022 14:57:14 +0200 +Subject: [PATCH] Drop ar 'u' argument + +binutils/ar is configured in deterministic mode by default making the +'u' argument irrelevant while leading to warning massages similar to: + +| ar: `u' modifier ignored since `D' is the default (see `U') + +We also add 'D' flag explicitely to not rely in the default configuration +for reproducible archives. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 92bcebe..0f2b84b 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -2678,7 +2678,7 @@ sub handle_libraries () + } + + define_variable ('AR', 'ar', INTERNAL); +- define_variable ('ARFLAGS', 'cru', INTERNAL); ++ define_variable ('ARFLAGS', 'crD', INTERNAL); + define_verbose_tagvar ('AR'); + + foreach my $pair (@liblist) +-- +2.25.1 + diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch new file mode 100644 index 0000000000..d28045618e --- /dev/null +++ b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch @@ -0,0 +1,83 @@ +From dff74c5b19935cc11b30116a7ae9c8affdff246b Mon Sep 17 00:00:00 2001 +From: Kumar Gala <galak@kernel.crashing.org> +Date: Thu, 11 Aug 2011 01:26:33 -0500 +Subject: [PATCH] automake: Update for python.m4 to respect libdir + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Kumar Gala <galak@kernel.crashing.org> + +Updated for automake-1.12.6 + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + m4/python.m4 | 24 ++++++------------------ + 1 file changed, 6 insertions(+), 18 deletions(-) + +diff --git a/m4/python.m4 b/m4/python.m4 +index 4e7de9427..40fc5b396 100644 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -96,6 +96,8 @@ AC_DEFUN([AM_PATH_PYTHON], + [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + ++ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) ++ + dnl At times, e.g., when building shared libraries, you may want + dnl to know which OS platform Python thinks this is. + dnl +@@ -251,14 +253,7 @@ except ImportError: + else + am_py_prefix=$am_cv_python_prefix + fi +- am_cv_python_pythondir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` ++ am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` + # + case $am_cv_python_pythondir in + $am_py_prefix*) +@@ -268,7 +263,7 @@ sys.stdout.write(sitedir)"` + *) + case $am_py_prefix in + /usr|/System*) ;; +- *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" ++ *) am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages + ;; + esac + ;; +@@ -293,14 +288,7 @@ sys.stdout.write(sitedir)"` + else + am_py_exec_prefix=$am_cv_python_exec_prefix + fi +- am_cv_python_pyexecdir=`$PYTHON -c " +-$am_python_setup_sysconfig +-if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) +-else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') +-sys.stdout.write(sitedir)"` ++ am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` + # + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) +@@ -310,7 +298,7 @@ sys.stdout.write(sitedir)"` + *) + case $am_py_exec_prefix in + /usr|/System*) ;; +- *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" ++ *) am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages + ;; + esac + ;; +-- +2.20.1 + 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 deleted file mode 100644 index 1592c02cb9..0000000000 --- a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 081385f4d4bba367afad3bff1fa034f5263305e6 Mon Sep 17 00:00:00 2001 -From: Serhii Popovych <spopovyc@cisco.com> -Date: Wed, 10 Feb 2016 17:07:32 +0000 -Subject: [PATCH] perl: Replace -w option in shebangs with modern "use - warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env - perl to use newer version of the perl from users PATH rather than older from - standard system path. - -However using /usr/bin/env perl -w from shebang line isn't -possible because it translates to something like -/usr/bin/env -w perl and env complains about illegal option. - -To address this we can remove -w option from perl shebang -line and add "use warnings" statement. - -Upstream-Status: Pending -Signed-off-by: Serhii Popovych <spopovyc@cisco.com> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - bin/aclocal.in | 3 ++- - bin/automake.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bin/aclocal.in b/bin/aclocal.in -index b3715d9..461d453 100644 ---- a/bin/aclocal.in -+++ b/bin/aclocal.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -32,6 +32,7 @@ BEGIN - } - - use strict; -+use warnings; - - use Automake::Config; - use Automake::General; -diff --git a/bin/automake.in b/bin/automake.in -index 8377d20..3a66965 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # -*- perl -*- - # @configure_input@ - -@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - package Automake; - - use strict; -+use warnings; - - BEGIN - { diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/buildtest.patch index b88b9e8693..c43a4ac8f3 100644 --- a/meta/recipes-devtools/automake/automake/buildtest.patch +++ b/meta/recipes-devtools/automake/automake/buildtest.patch @@ -36,7 +36,7 @@ index e0db651..de137fa 100644 -check-TESTS: $(TESTS) +AM_RECURSIVE_TARGETS += buildtest runtest + -+buildtest-TESTS: $(TESTS) ++buildtest-TESTS: $(TESTS) $(check_PROGRAMS) + +check-TESTS: buildtest-TESTS + $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch deleted file mode 100644 index ee1f725f76..0000000000 --- a/meta/recipes-devtools/automake/automake/python-libdir.patch +++ /dev/null @@ -1,88 +0,0 @@ -From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001 -From: Kumar Gala <galak@kernel.crashing.org> -Date: Thu, 11 Aug 2011 01:26:33 -0500 -Subject: [PATCH] automake: Update for python.m4 to respect libdir - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Kumar Gala <galak@kernel.crashing.org> - -Updated for automake-1.12.6 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - m4/python.m4 | 27 +++++++-------------------- - 1 file changed, 7 insertions(+), 20 deletions(-) - -diff --git a/m4/python.m4 b/m4/python.m4 -index 63c0a0e..7bbd2d2 100644 ---- a/m4/python.m4 -+++ b/m4/python.m4 -@@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - -- dnl Use the values of $prefix and $exec_prefix for the corresponding -- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made -+ dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding -+ dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made - dnl distinct variables so they can be overridden if need be. However, - dnl general consensus is that you shouldn't need this ability. - - AC_SUBST([PYTHON_PREFIX], ['${prefix}']) -+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) - - dnl At times (like when building shared libraries) you may want -@@ -144,14 +145,7 @@ except ImportError: - else - am_py_prefix=$prefix - fi -- am_cv_python_pythondir=`$PYTHON -c " --$am_python_setup_sysconfig --if can_use_sysconfig: -- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) --else: -- from distutils import sysconfig -- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') --sys.stdout.write(sitedir)"` -+ am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"` - case $am_py_prefix in - /usr|/System*) ;; - *) -- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages -+ am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages - ;; - esac - ;; -@@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"` - else - am_py_exec_prefix=$exec_prefix - fi -- am_cv_python_pyexecdir=`$PYTHON -c " --$am_python_setup_sysconfig --if can_use_sysconfig: -- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) --else: -- from distutils import sysconfig -- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') --sys.stdout.write(sitedir)"` -+ am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"` - case $am_py_exec_prefix in - /usr|/System*) ;; - *) -- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages -+ am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages - ;; - esac - ;; |