I don't know why we copy aclocal.m4 to acinclude.m4 to avoid autotools.bbclass deleting the upstream hand-maintained aclocal.m4, but we do.
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-sato/rxvt-unicode/rxvt-unicode.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 2eab0d4ec4c..5a1b44a71c3 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -36,11 +36,8 @@ EXTRA_OECONF = "--enable-xim \ PACKAGECONFIG ??= "" PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," -do_configure:prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} +# Ensure we don't delete the shipped aclocal.m4 +EXTRA_AUTORECONF += "--exclude=aclocal" do_compile:prepend () { echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#232204): https://lists.openembedded.org/g/openembedded-core/message/232204 Mute This Topic: https://lists.openembedded.org/mt/118093409/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
