The last meaningful change to freedesktop.org pkgconfig was in 2019, but pkgconf is actively maintained.
Major distributions such as Fedora (and derivates), Debian (ditto), Arch Linux, Buildroot, and Alpine have all moved to pkgconf already. There's a subtle behaviour change between pkgconfig and pkgconf, whereas pkgconfig appends the sysroot to PKG_CONFIG_SYSTEM_INCLUDE_PATH pkgconf does not, so we need to sysroot-prefix those variables. Signed-off-by: Ross Burton <[email protected]> --- meta/classes-recipe/pkgconfig.bbclass | 6 +++--- meta/conf/distro/include/default-providers.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/classes-recipe/pkgconfig.bbclass b/meta/classes-recipe/pkgconfig.bbclass index c0d91393b36..4912b9904ba 100644 --- a/meta/classes-recipe/pkgconfig.bbclass +++ b/meta/classes-recipe/pkgconfig.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -DEPENDS:prepend = "pkgconfig-native " +DEPENDS:prepend = "pkgconf-native " export PKG_CONFIG_PATH ?= "" export PKG_CONFIG_LIBDIR ?= "${STAGING_LIBDIR}/pkgconfig:${STAGING_DATADIR}/pkgconfig" @@ -12,5 +12,5 @@ export PKG_CONFIG_LIBDIR ?= "${STAGING_LIBDIR}/pkgconfig:${STAGING_DATADIR}/pkgc 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}" +export PKG_CONFIG_SYSTEM_LIBRARY_PATH ?= "${STAGING_BASELIBDIR}:${STAGING_LIBDIR}" +export PKG_CONFIG_SYSTEM_INCLUDE_PATH ?= "${STAGING_INCDIR}" diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 5101ad78f88..c0a5d1c75e5 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -56,9 +56,9 @@ PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" PREFERRED_PROVIDER_openssl ?= "openssl" PREFERRED_PROVIDER_openssl-native ?= "openssl-native" PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl" -PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" -PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig" -PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native" +PREFERRED_PROVIDER_pkgconfig ?= "pkgconf" +PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconf" +PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconf-native" PREFERRED_RPROVIDER_initd-functions ?= "initscripts" PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233603): https://lists.openembedded.org/g/openembedded-core/message/233603 Mute This Topic: https://lists.openembedded.org/mt/118416246/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
