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@mentor.com>
Acked-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7f01f8f..573f7ff 100644 (file)
--- 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"