diff options
Diffstat (limited to 'meta/recipes-devtools/pkgconf/pkgconf')
3 files changed, 1 insertions, 13 deletions
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in index 4fc9b0a4a7..d4ac71dff2 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in @@ -5,7 +5,6 @@ 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 @@ -16,9 +15,8 @@ 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.real "$@" +pkg-config "$@" diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in index 9ed30a0d80..c2e86e5ac1 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in @@ -1,6 +1,5 @@ #! /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 695f349566..fc9b48803f 100755 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper @@ -4,13 +4,4 @@ # Copyright (C) 2015 Christopher Larson <chris_larson@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 "$@" |