From: Ross Burton Date: Wed, 4 Mar 2026 16:48:33 +0000 (+0000) Subject: readline: improve aclocal.m4 handling X-Git-Tag: uninative-5.1~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d35a1a169794e7bed17c0b2c91e07f410660df87;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git readline: improve aclocal.m4 handling 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 555bd0876f..06630dc455 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}