[oe-commits] Chris Larson : bitbake.conf: fix pkg-config relocation issue

[git version control]

Module: openembedded.git
Branch: master
Commit: c04b2d70a1d1816b925a21d40dbc539bf68162c3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c04b2d70a1d1816b925a21d40dbc539bf68162c3

Author: Chris Larson <chris_larson at mentor.com>
Date:   Sat Oct  9 19:38:39 2010 +0000

bitbake.conf: fix pkg-config relocation issue

By default, pkg-config falls back to checking the default search path for .pc
files, which is the native location.  If you relocate it, it will be unable to
hit that location, which can cause problems in certain cases.  In particular,
gnome-bluetooth requires gtk-doc-native to run its tools, and uses pkg-config
to determine its availability.

Fix by adding the native pkg-config locations to the PKG_CONFIG_PATH.

Signed-off-by: Chris Larson <chris_larson at mentor.com>
Acked-by: Khem Raj <raj.khem at gmail.com>

---

 conf/bitbake.conf |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7f01f8f..573f7ff 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -641,8 +641,9 @@ SLOT = "0"
 
 # Other
 
-export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig"
-export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
+export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig:${STAGING_DATADIR}/pkgconfig"
+PKG_CONFIG_PATH .= ":${STAGING_LIBDIR_NATIVE}/pkgconfig:${STAGING_DATADIR_NATIVE}/pkgconfig"
+
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"