From patchwork Fri Jan 23 18:04:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 79543 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 872A5D778A6 for ; Fri, 23 Jan 2026 18:05:09 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.1650.1769191500257904082 for ; Fri, 23 Jan 2026 10:05:00 -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 590691476 for ; Fri, 23 Jan 2026 10:04: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 8A08C3F694 for ; Fri, 23 Jan 2026 10:04:59 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/8] pkgconf: small cleanups Date: Fri, 23 Jan 2026 18:04:46 +0000 Message-ID: <20260123180448.2997378-7-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:05:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/229909 There's no need to --with-pkg-confg-dir as the default is the same and correct. Don't append BBCLASSEXTEND, there's no need. Sync pkg-config-native with the pkg-config recipe so that it sets the variables in the same way. Signed-off-by: Ross Burton --- meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in | 3 ++- meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in index 0d736fe4d4..8addefbb80 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in @@ -1,6 +1,7 @@ #! /bin/sh -PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH" +export PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH" +export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" unset PKG_CONFIG_SYSROOT_DIR pkg-config "$@" diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb index 12ca075b5d..e3500431b3 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb @@ -24,8 +24,6 @@ SRC_URI[sha256sum] = "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a inherit autotools -EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig'" - do_install:append () { # Install a wrapper which deals, as much as possible with pkgconf vs # pkg-config compatibility issues. @@ -36,6 +34,7 @@ do_install:append:class-native () { # Install a pkg-config-native wrapper that will use the native sysroot instead # of the MACHINE sysroot, for using pkg-config when building native tools. sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ + -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ @@ -53,7 +52,7 @@ RPROVIDES:${PN} += "pkgconfig(pkg-config)" FILES:${PN}-dev:remove = "${datadir}/aclocal" FILES:${PN} += "${datadir}/aclocal" -BBCLASSEXTEND += "native nativesdk" +BBCLASSEXTEND = "native nativesdk" pkgconf_sstate_fixup_esdk () { if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then