[oe-commits] Peter Seebach : multilib.conf: set MULTILIB_GLOBAL_VARIANTS conditionally
git at git.openembedded.org
git at git.openembedded.org
Thu Oct 30 13:03:24 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 2645c07892abe79f73379b1ca4196f593cb3b330
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2645c07892abe79f73379b1ca4196f593cb3b330
Author: Peter Seebach <peter.seebach at windriver.com>
Date: Thu Oct 23 16:42:10 2014 -0500
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/conf/multilib.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 733236d..37e8481 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -14,6 +14,6 @@ INHERIT += "multilib_global"
BBCLASSEXTEND_append = " ${MULTILIBS}"
-MULTILIB_GLOBAL_VARIANTS = "lib32 lib64 libx32"
+MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32"
OPKG_ARGS_append = " --force-maintainer --force-overwrite"
More information about the Openembedded-commits
mailing list