diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-07-17 09:20:15 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 22:51:37 +0100 |
commit | fedac61ad973981b824a2c79ffc9feaa6d754dba (patch) | |
tree | 04010f526351861775a17c311f4eb5343ccacaf4 /meta/recipes-devtools/pkgconfig/pkgconfig | |
parent | d98a2f4df0963fe14fff85650185642c51b63c97 (diff) | |
download | poky-fedac61ad973981b824a2c79ffc9feaa6d754dba.tar.gz |
pkgconfig: allow kernel to be build with esdk
When the kernel's menuconfig target is called while using the esdk or an
esdk-based container, the pkg-config info that is found is not correct.
The pkg-config info is for the target, but we need the eSDK's information
in order to build the host based menuconfig.
The new pkg-config-esdk script checks both that it's in SDK and being
called from the check-lxdialog script in order to limit the scope of when
the pkg-config automagically switches to pkg-config-native.
The pkg-config-esdk is only installed as pkg-config inside the eSDK, which
is why we use the sstate post install script and check for if we are in the
esdk environment using the WITHIN_EXT_SDK
[YOCTO #11155]
(From OE-Core rev: 0954452d151613fa758fbde8ee9469b30d80776b)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pkgconfig/pkgconfig')
-rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in new file mode 100644 index 0000000000..4fc9b0a4a7 --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in | |||
@@ -0,0 +1,24 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | # Orignal pkg-config-native action when called as pkg-config-native | ||
4 | # NO Change here | ||
5 | if [ "pkg-config-native" = "`basename $0`" ] ; then | ||
6 | PKG_CONFIG_PATH="@PATH_NATIVE@" | ||
7 | PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" | ||
8 | unset PKG_CONFIG_SYSROOT_DIR | ||
9 | else | ||
10 | # in this case check if we are in the esdk | ||
11 | if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then | ||
12 | parentpid=`ps -o ppid= -p $$` | ||
13 | parentpid_info=`ps -wo comm= -o args= -p $parentpid` | ||
14 | |||
15 | # check if we are being called from the kernel's make menuconfig | ||
16 | if ( echo $parentpid_info | grep -q check-lxdialog ) ; then | ||
17 | PKG_CONFIG_PATH="@PATH_NATIVE@" | ||
18 | PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" | ||
19 | unset PKG_CONFIG_SYSROOT_DIR | ||
20 | fi | ||
21 | fi | ||
22 | fi | ||
23 | |||
24 | pkg-config.real "$@" | ||