summaryrefslogtreecommitdiffstats
path: root/poky/meta/recipes-devtools/pkgconf/pkgconf
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta/recipes-devtools/pkgconf/pkgconf')
-rw-r--r--poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in24
-rw-r--r--poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in6
-rwxr-xr-xpoky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper16
3 files changed, 46 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
new file mode 100644
index 000000000..4fc9b0a4a
--- /dev/null
+++ b/poky/meta/recipes-devtools/pkgconf/pkgconf/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/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
new file mode 100644
index 000000000..9ed30a0d8
--- /dev/null
+++ b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+PKG_CONFIG_PATH="@PATH_NATIVE@"
+unset PKG_CONFIG_SYSROOT_DIR
+
+pkg-config "$@"
diff --git a/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
new file mode 100755
index 000000000..695f34956
--- /dev/null
+++ b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
@@ -0,0 +1,16 @@
+#!/bin/sh
+# pkgconf wrapper to deal with pkg-config/pkgconf compatibility issues
+#
+# 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 "$@"
OpenPOWER on IntegriCloud