summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-30 17:43:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-30 17:48:34 +0100
commit22001ba163e80b114212580279339acd15fa7298 (patch)
tree0d30f98b755dcb95a20880182dc4c0d074390e05
parentce1e7fcc60276040477c1d5e3129e029bb9f204b (diff)
downloadopenembedded-core-contrib-22001ba163e80b114212580279339acd15fa7298.tar.gz
openembedded-core-contrib-22001ba163e80b114212580279339acd15fa7298.tar.bz2
openembedded-core-contrib-22001ba163e80b114212580279339acd15fa7298.zip
multilib.conf: Ensure sstate checksums don't change when using this include
When enabling multilib.conf, the world was rebuilding due to changes in the pkg-config search path. This doesn't matter so exclude it from the checksums. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/multilib.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 50303fb5d6..1403a034a6 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -24,4 +24,5 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite"
# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's
# architecture-independent pkgconfig location to PKG_CONFIG_PATH.
PKG_CONFIG_PATH .= ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig"
-PKG_CONFIG_PATH[vardepsexclude] = "MACHINE"
+PKG_CONFIG_PATH[vardepsexclude] = "MACHINE datadir STAGING_DIR"
+PKG_CONFIG_PATH[vardepvalueexclude] = ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig"