From 46c48c26ab1916e2dfb841d74a0f2a58d8b2b870 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 6 Feb 2016 12:30:02 +0000 Subject: bitbake.conf/native/nativesdk: Set PKG_CONFIG_SYSTEM_ at top level Setting PKG_CONFIG_SYSTEM_{HEADERS/INCLUDE}_PATH for nativesdk isn't enough, we also need to deal with multlib cases where libdir from pkg-config-native isn't correct. Native builds are about the only case where this variable shouldn't be set. Therefore move the code from nativesdk to bitbake.conf and unexport it in the native case. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/conf') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 775c0c6617..b307f387c0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -647,6 +647,8 @@ export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" +export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" +export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" ### ### Config file processing -- cgit 1.2.3-korg