From patchwork Thu Feb 12 16:42:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 80991 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 0323DEE36AE for ; Thu, 12 Feb 2026 16:43:06 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.49576.1770914580878399937 for ; Thu, 12 Feb 2026 08:43:01 -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 9C6A4497 for ; Thu, 12 Feb 2026 08:42:53 -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 974BE3F63F for ; Thu, 12 Feb 2026 08:42:59 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/6] cmake: clean up variables shared between .bb and .inc Date: Thu, 12 Feb 2026 16:42:49 +0000 Message-ID: <20260212164254.1110652-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260212164254.1110652-1-ross.burton@arm.com> References: <20260212164254.1110652-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 ; Thu, 12 Feb 2026 16:43:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/231042 Use EXTRA_OECMAKE in the non-cmake-inheriting cmake-native recipe, so that the cmake.inc can assign once. Signed-off-by: Ross Burton --- meta/recipes-devtools/cmake/cmake-native_4.2.3.bb | 4 ++-- meta/recipes-devtools/cmake/cmake_4.2.3.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb index 128fef8a6e..299cb4d1ea 100644 --- a/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_4.2.3.bb @@ -22,7 +22,7 @@ LIC_FILES_CHKSUM:append = " \ B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" -CMAKE_EXTRACONF = "\ +EXTRA_OECMAKE += "\ -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ -DBUILD_CursesDialog=1 \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ @@ -41,7 +41,7 @@ do_configure () { ${S}/bootstrap --verbose --prefix=${prefix} \ ${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \ ${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \ - -- ${CMAKE_EXTRACONF} + -- ${EXTRA_OECMAKE} } do_compile() { diff --git a/meta/recipes-devtools/cmake/cmake_4.2.3.bb b/meta/recipes-devtools/cmake/cmake_4.2.3.bb index 7c3dda2b15..233ceeae15 100644 --- a/meta/recipes-devtools/cmake/cmake_4.2.3.bb +++ b/meta/recipes-devtools/cmake/cmake_4.2.3.bb @@ -33,7 +33,7 @@ python () { d.setVar("docdir_stripped", docdir_stripped) } -EXTRA_OECMAKE = " \ +EXTRA_OECMAKE += " \ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \