summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2014-10-23 16:42:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:01:22 +0000
commitef32b9f55d9c6ef1ac8919f6eafac3e2303bfc89 (patch)
treeb8e5b45cd2b31aca0367b15db5269eec2c0d2c37 /meta
parent55d66edd36b4884100e49f9fa08555c91b7f91c3 (diff)
downloadpoky-ef32b9f55d9c6ef1ac8919f6eafac3e2303bfc89.tar.gz
multilib.conf: set MULTILIB_GLOBAL_VARIANTS conditionally
It is not entirely obvious that all reasonable configurations will have multilib.conf strictly before the file which might want to set MULTILIB_GLOBAL_VARIANTS. The x86-ish values here look like reasonable default guesses, but shouldn't override an explicit setting. (From OE-Core rev: 2645c07892abe79f73379b1ca4196f593cb3b330) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/multilib.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 733236d6bb..37e8481112 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -14,6 +14,6 @@ INHERIT += "multilib_global"
14 14
15BBCLASSEXTEND_append = " ${MULTILIBS}" 15BBCLASSEXTEND_append = " ${MULTILIBS}"
16 16
17MULTILIB_GLOBAL_VARIANTS = "lib32 lib64 libx32" 17MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32"
18 18
19OPKG_ARGS_append = " --force-maintainer --force-overwrite" 19OPKG_ARGS_append = " --force-maintainer --force-overwrite"