diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 12:30:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 23:10:44 +0000 |
commit | ed5daa177baff265589bc50ea21a440693d4c478 (patch) | |
tree | 2585d04df2b9a96eea4e99402a17c68dca8703e3 /meta/classes/native.bbclass | |
parent | 8fa2d52dfcd298f7814c4686314ebcba2247f487 (diff) | |
download | poky-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/classes/native.bbclass')
-rw-r--r-- | meta/classes/native.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index a3a5c8c748..f67ef00142 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -106,6 +106,8 @@ PKG_CONFIG_DIR = "${libdir}/pkgconfig" | |||
106 | EXTRA_NATIVE_PKGCONFIG_PATH ?= "" | 106 | EXTRA_NATIVE_PKGCONFIG_PATH ?= "" |
107 | PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" | 107 | PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" |
108 | PKG_CONFIG_SYSROOT_DIR = "" | 108 | PKG_CONFIG_SYSROOT_DIR = "" |
109 | PKG_CONFIG_SYSTEM_LIBRARY_PATH[unexport] = "1" | ||
110 | PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" | ||
109 | 111 | ||
110 | # we dont want libc-uclibc or libc-glibc to kick in for native recipes | 112 | # we dont want libc-uclibc or libc-glibc to kick in for native recipes |
111 | LIBCOVERRIDE = "" | 113 | LIBCOVERRIDE = "" |