From patchwork Mon Mar 2 13:49:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 82259 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 A68F4EA4E02 for ; Mon, 2 Mar 2026 13:49:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.160689.1772459374387623158 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 7841F14BF for ; Mon, 2 Mar 2026 05:49:27 -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 78CD93F73B for ; Mon, 2 Mar 2026 05:49:33 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 1/4] readline: improve aclocal.m4 handling Date: Mon, 2 Mar 2026 13:49:26 +0000 Message-ID: <20260302134929.210823-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/232202 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 --- 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}