I don't know why I decided to copy aclocal.m4 to acinclude.m4 to avoid
autotools.bbclass deleting the upstream hand-maintained aclocal.m4, but
I did.

A neater fix is to exclude aclocal, which has the side-effect of not
deleting aclocal.m4 in do_configure.

Signed-off-by: Ross Burton <[email protected]>
---
 meta/recipes-core/readline/readline.inc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/readline/readline.inc 
b/meta/recipes-core/readline/readline.inc
index 555bd0876f9..06630dc455c 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -17,17 +17,13 @@ SRC_URI += "file://inputrc"
 
 inherit autotools texinfo
 
-EXTRA_AUTORECONF += "--exclude=autoheader"
+# Ensure we don't delete the shipped aclocal.m4 or config.h.in
+EXTRA_AUTORECONF += "--exclude=autoheader,aclocal"
+
 EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library"
 
 LEAD_SONAME = "libreadline.so"
 
-do_configure:prepend () {
-       if [ ! -e ${S}/acinclude.m4 ]; then
-               cat ${S}/aclocal.m4 > ${S}/acinclude.m4
-       fi
-}
-
 do_install:append () {
        # Make install doesn't properly install these
        oe_libinstall -so -C shlib libhistory ${D}${libdir}
-- 
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#232202): 
https://lists.openembedded.org/g/openembedded-core/message/232202
Mute This Topic: https://lists.openembedded.org/mt/118093407/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to