From patchwork Fri Jan 23 18:04:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 79541 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 74D67D778A5 for ; Fri, 23 Jan 2026 18:04:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.1638.1769191498979072918 for ; Fri, 23 Jan 2026 10:04:59 -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 12E521476 for ; Fri, 23 Jan 2026 10:04:52 -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 46FB13F694 for ; Fri, 23 Jan 2026 10:04:58 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/8] classes/pkgconfig: move variable exports to the class Date: Fri, 23 Jan 2026 18:04:44 +0000 Message-ID: <20260123180448.2997378-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123180448.2997378-1-ross.burton@arm.com> References: <20260123180448.2997378-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 ; Fri, 23 Jan 2026 18:04:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/229907 All recipes that use pkg-config should be inheriting the class so this is a no-op change for those, and for recipes that do not use pkg-config will no longer need to rebuild if these variables are changed. Any recipes that use pkg-config but do not inherit the class will fail to build, and this is intentional: those recipes should inherit the class. This commit is simply the move of the exports, the values do not change. Signed-off-by: Ross Burton --- meta/classes-recipe/pkgconfig.bbclass | 7 +++++++ meta/conf/bitbake.conf | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/meta/classes-recipe/pkgconfig.bbclass b/meta/classes-recipe/pkgconfig.bbclass index 1e1f3824dd..ea91338d34 100644 --- a/meta/classes-recipe/pkgconfig.bbclass +++ b/meta/classes-recipe/pkgconfig.bbclass @@ -6,3 +6,10 @@ DEPENDS:prepend = "pkgconfig-native " +export PKG_CONFIG_DIR +export PKG_CONFIG_PATH +export PKG_CONFIG_LIBDIR +export PKG_CONFIG_SYSROOT_DIR +export PKG_CONFIG_DISABLE_UNINSTALLED +export PKG_CONFIG_SYSTEM_LIBRARY_PATH +export PKG_CONFIG_SYSTEM_INCLUDE_PATH diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 88f4d0df69..8779f65157 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -768,13 +768,13 @@ BUILDCFG_NEEDEDVARS[type] = "list" # Other -export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" -export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" -export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}" -export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" -export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" -export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" +PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" +PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" +PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}" +PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" +PKG_CONFIG_DISABLE_UNINSTALLED = "yes" +PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" +PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" # Don't allow git to chdir up past WORKDIR or TMPDIR so that it doesn't detect the OE # repository when building a recipe.