From 8557475e37baf5a9e20583812a26745e3601f382 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Mon, 26 Feb 2018 10:58:48 +0200 Subject: pkgconf: revert changes to pkg-config-wrapper To maintain the status quo, revert changes to pkgconf wrappers. This helps to keep it compatible with freedesktop.org pkg-config. (From OE-Core rev: 8ee8eb8a15e0e4a652df3fe77805d9cffa02ed22) Signed-off-by: Maxin B. John Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in') diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in index d4ac71dff2..4fc9b0a4a7 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in @@ -5,6 +5,7 @@ if [ "pkg-config-native" = "`basename $0`" ] ; then PKG_CONFIG_PATH="@PATH_NATIVE@" PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" + unset PKG_CONFIG_SYSROOT_DIR else # in this case check if we are in the esdk if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then @@ -15,8 +16,9 @@ else if ( echo $parentpid_info | grep -q check-lxdialog ) ; then PKG_CONFIG_PATH="@PATH_NATIVE@" PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" + unset PKG_CONFIG_SYSROOT_DIR fi fi fi -pkg-config "$@" +pkg-config.real "$@" -- cgit v1.2.3-54-g00ecf