bash: remove aclocal workarounds

Instead of patching configure.ac to not load m4 directly and working
around what aclocal and the autotools class do, just exclude the running
of aclocal entirely.

This stops the class removing the existing aclocal.m4 and autoreconf
running aclocal.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 66058feff388cc6e6e17dc5df41a5a0aa6c61bfc..634209c911520be9d61e67fbd2a53be5a70f478d 100644 (file)
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -7,7 +7,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv"
 
 inherit autotools gettext texinfo update-alternatives ptest
 
-EXTRA_AUTORECONF += "--exclude=autoheader"
+EXTRA_AUTORECONF += "--exclude=autoheader,aclocal"
 EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8"
 
 # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the
@@ -46,12 +46,6 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = " \
 
 CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}"
 
-do_configure:prepend () {
-    if [ ! -e ${S}/acinclude.m4 ]; then
-       cat ${S}/aclocal.m4 > ${S}/acinclude.m4
-    fi
-}
-
 do_compile:prepend() {
     # Remove any leftover .build files. This ensures that bash always has the
     # same version number and keeps builds reproducible

diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch
deleted file mode 100644 (file)
index e966b03..0000000
--- a/meta/recipes-extended/bash/bash/use_aclocal.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From b3a64702fa1978463c01bd5d9fe711e4628aba1e Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 28 Dec 2020 21:04:27 +0100
-Subject: [PATCH] bash: update 5.0 -> 5.1
-
-Including m4 files directly like this confuses autotools.bbclass, remove
-the references and rely upon aclocal to collect the m4 files together
-as needed instead making it work like other autotools based projects.
-
-Upstream-Status: Inappropriate [OE configuration specific]
-RP 2021/1/20
----
- configure.ac | 43 -------------------------------------------
- 1 file changed, 43 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 50a6e20..a3b5bd7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -710,49 +710,6 @@ if test x$SIZE = x; then
- fi
- AC_SUBST(SIZE)
- 
--m4_include([m4/stat-time.m4])
--m4_include([m4/timespec.m4])
--
--m4_include([m4/strtoimax.m4])
--
--dnl include files for gettext
--
--m4_include([m4/codeset.m4])
--m4_include([m4/extern-inline.m4])
--m4_include([m4/fcntl-o.m4])
--m4_include([m4/gettext.m4])
--m4_include([m4/glibc2.m4])
--m4_include([m4/glibc21.m4])
--m4_include([m4/host-cpu-c-abi.m4])
--m4_include([m4/iconv.m4])
--m4_include([m4/intdiv0.m4])
--m4_include([m4/intl.m4])
--m4_include([m4/intlmacosx.m4])
--m4_include([m4/intl-thread-locale.m4])
--m4_include([m4/intmax.m4])
--m4_include([m4/inttypes-pri.m4])
--m4_include([m4/inttypes.m4])
--m4_include([m4/inttypes_h.m4])
--m4_include([m4/lcmessage.m4])
--m4_include([m4/lib-ld.m4])
--m4_include([m4/lib-link.m4])
--m4_include([m4/lib-prefix.m4])
--m4_include([m4/lock.m4])
--m4_include([m4/nls.m4])
--m4_include([m4/po.m4])
--m4_include([m4/printf-posix.m4])
--m4_include([m4/progtest.m4])
--m4_include([m4/pthread_rwlock_rdlock.m4])
--m4_include([m4/size_max.m4])
--m4_include([m4/stdint_h.m4])
--m4_include([m4/threadlib.m4])
--m4_include([m4/uintmax_t.m4])
--m4_include([m4/ulonglong.m4])
--m4_include([m4/visibility.m4])
--m4_include([m4/wchar_t.m4])
--m4_include([m4/wint_t.m4])
--m4_include([m4/xsize.m4])
--
- dnl C compiler characteristics
- AC_C_CONST
- AC_C_INLINE

diff --git a/meta/recipes-extended/bash/bash_5.2.37.bb b/meta/recipes-extended/bash/bash_5.2.37.bb
index 3dcaefa374e669f5508bf473750b578eac2abd20..20c51ecdbc9e9cdd296bf2cc6a8a164e3b7cc0a8 100644 (file)
--- a/meta/recipes-extended/bash/bash_5.2.37.bb
+++ b/meta/recipes-extended/bash/bash_5.2.37.bb
@@ -11,7 +11,6 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
            file://run-ptest \
            file://run-bash-ptests \
            file://fix-run-builtins.patch \
-           file://use_aclocal.patch \
            file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \
            file://fix-filesubst-errexit.patch \
            "