From patchwork Mon Mar 2 13:49:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 82260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 946D4EA4E04 for ; Mon, 2 Mar 2026 13:49:45 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.160479.1772459375298484057 for ; Mon, 02 Mar 2026 05:49:35 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D05C1570 for ; Mon, 2 Mar 2026 05:49:28 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 91A5E3F73B for ; Mon, 2 Mar 2026 05:49:34 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 3/4] rxvt: improve aclocal.m4 handling Date: Mon, 2 Mar 2026 13:49:28 +0000 Message-ID: <20260302134929.210823-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260302134929.210823-1-ross.burton@arm.com> References: <20260302134929.210823-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 02 Mar 2026 13:49:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/232204 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 --- 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