summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-06 12:30:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-06 23:10:44 +0000
commited5daa177baff265589bc50ea21a440693d4c478 (patch)
tree2585d04df2b9a96eea4e99402a17c68dca8703e3 /meta/conf
parent8fa2d52dfcd298f7814c4686314ebcba2247f487 (diff)
downloadpoky-ed5daa177baff265589bc50ea21a440693d4c478.tar.gz
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. (From OE-Core rev: 46c48c26ab1916e2dfb841d74a0f2a58d8b2b870) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 2 insertions, 0 deletions
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"
647export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}" 647export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}"
648export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 648export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
649export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 649export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
650export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}"
651export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}"
650 652
651### 653###
652### Config file processing 654### Config file processing