summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-02-26 10:58:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:35:40 +0000
commit8557475e37baf5a9e20583812a26745e3601f382 (patch)
tree3bd7f7ec1edaab2a2e7729bf8a7c29ffbca4655a /meta
parent28ddb2d05c2a148586f2431cab8d279385f705a1 (diff)
downloadpoky-8557475e37baf5a9e20583812a26745e3601f382.tar.gz
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 <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in4
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in1
-rwxr-xr-xmeta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper9
3 files changed, 13 insertions, 1 deletions
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 @@
5if [ "pkg-config-native" = "`basename $0`" ] ; then 5if [ "pkg-config-native" = "`basename $0`" ] ; then
6 PKG_CONFIG_PATH="@PATH_NATIVE@" 6 PKG_CONFIG_PATH="@PATH_NATIVE@"
7 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" 7 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
8 unset PKG_CONFIG_SYSROOT_DIR
8else 9else
9 # in this case check if we are in the esdk 10 # in this case check if we are in the esdk
10 if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then 11 if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
@@ -15,8 +16,9 @@ else
15 if ( echo $parentpid_info | grep -q check-lxdialog ) ; then 16 if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
16 PKG_CONFIG_PATH="@PATH_NATIVE@" 17 PKG_CONFIG_PATH="@PATH_NATIVE@"
17 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" 18 PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
19 unset PKG_CONFIG_SYSROOT_DIR
18 fi 20 fi
19 fi 21 fi
20fi 22fi
21 23
22pkg-config "$@" 24pkg-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 c2e86e5ac1..9ed30a0d80 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 @@
1#! /bin/sh 1#! /bin/sh
2 2
3PKG_CONFIG_PATH="@PATH_NATIVE@" 3PKG_CONFIG_PATH="@PATH_NATIVE@"
4unset PKG_CONFIG_SYSROOT_DIR
4 5
5pkg-config "$@" 6pkg-config "$@"
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
index fc9b48803f..695f349566 100755
--- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
+++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
@@ -4,4 +4,13 @@
4# Copyright (C) 2015 Christopher Larson <chris_larson@mentor.com> 4# Copyright (C) 2015 Christopher Larson <chris_larson@mentor.com>
5# License: MIT (see COPYING.MIT at the root of the repository for terms) 5# License: MIT (see COPYING.MIT at the root of the repository for terms)
6 6
7for arg; do
8 case "$arg" in
9 --variable|--variable=*)
10 # pkg-config doesn't sysroot-prefix user variables
11 unset PKG_CONFIG_SYSROOT_DIR
12 ;;
13 esac
14done
15
7exec pkgconf "$@" 16exec pkgconf "$@"