From: Ross Burton <ross.burton@arm.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/4] rxvt: improve aclocal.m4 handling
Date: Wed, 25 Feb 2026 12:37:25 +0000 [thread overview]
Message-ID: <20260225123727.2043715-3-ross.burton@arm.com> (raw)
In-Reply-To: <20260225123727.2043715-1-ross.burton@arm.com>
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 <ross.burton@arm.com>
---
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
next prev parent reply other threads:[~2026-02-25 12:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-25 12:37 [PATCH 1/4] readline: improve aclocal.m4 handling Ross Burton
2026-02-25 12:37 ` [PATCH 2/4] lzop: " Ross Burton
2026-02-25 18:58 ` [OE-core] " Peter Kjellerstedt
2026-03-02 13:49 ` Ross Burton
2026-02-25 12:37 ` Ross Burton [this message]
2026-02-25 12:37 ` [PATCH 4/4] autotools: remove deletion of aclocal.m4 Ross Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260225123727.2043715-3-ross.burton@arm.com \
--to=ross.burton@arm.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox