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]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

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 (file)
index 0000000..4fc9b0a
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Orignal pkg-config-native action when called as pkg-config-native
+# NO Change here
+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
+               parentpid=`ps -o ppid= -p $$`
+               parentpid_info=`ps -wo comm= -o args= -p $parentpid`
+
+               # check if we are being called from  the kernel's make menuconfig
+               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 "$@"

diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index e6340218e0528e30ccadadae562fc7c076a29764..52ef2a977930d624541da85f1e6ba177834ec7f1 100644 (file)
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -12,6 +12,7 @@ SRCREV = "edf8e6f0ea77ede073f07bff0d2ae1fc7a38103b"
 PV = "0.29.2+git${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/pkg-config \
+           file://pkg-config-esdk.in \
            file://pkg-config-native.in \
            file://fix-glib-configure-libtool-usage.patch \
            file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
@@ -54,4 +55,19 @@ do_install_append_class-native () {
         -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \
         < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native
     install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native
+    sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \
+        -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \
+        < ${WORKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk
+    install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk
 }
+
+pkgconfig_sstate_fixup_esdk () {
+       if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then
+               pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}"
+               mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real
+               lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
+               sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native
+       fi
+}
+
+SSTATEPOSTUNPACKFUNCS_append_class-native = " pkgconfig_sstate_fixup_esdk"