[OE-core] [PATCH] pkgconf: revert changes to pkg-config-wrapper

[Maxin B. John]

To maintain the status quo, revert changes to pkgconf wrappers.
This helps to keep it compatible with freedesktop.org pkg-config.

Signed-off-by: Maxin B. John <maxin.j...@intel.com>
---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in   | 4 +++-
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in | 1 +
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper   | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in 
b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
index d4ac71d..4fc9b0a 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 "$@"
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in 
b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
index c2e86e5..9ed30a0 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
@@ -1,5 +1,6 @@
 #! /bin/sh
 
 PKG_CONFIG_PATH="@PATH_NATIVE@"
+unset PKG_CONFIG_SYSROOT_DIR
 
 pkg-config "$@"
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper 
b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
index fc9b488..695f349 100755
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
@@ -4,4 +4,13 @@
 # Copyright (C) 2015 Christopher Larson <chris_lar...@mentor.com>
 # License: MIT (see COPYING.MIT at the root of the repository for terms)
 
+for arg; do
+    case "$arg" in
+        --variable|--variable=*)
+            # pkg-config doesn't sysroot-prefix user variables
+            unset PKG_CONFIG_SYSROOT_DIR
+            ;;
+    esac
+done
+
 exec pkgconf "$@"
-- 
2.4.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core