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 <[email protected]> --- 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 -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229909): https://lists.openembedded.org/g/openembedded-core/message/229909 Mute This Topic: https://lists.openembedded.org/mt/117422754/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
