[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH] multilib_global: Fix PREFERRED_VERSION mapping for gcc-cross-canadian
From: richard.purdie () linuxfoundation ! org (Richard Purdie)
Date: 2015-07-31 10:29:35
Message-ID: 1438338575.22462.14.camel () linuxfoundation ! org
[Download RAW message or body]
Our multilib cross toolchains have <ml_prefix> as a prefix however we
only have a single gcc-cross-canadian for each arch and it is not
prefixed even in the multilib case. We can have two versions of
gcc-cross-canadian, 32 and 64 bit.
This fixes the multilib PREFERRED_VERSION mapping code so that
no prefix is added to the preferred version and therefore the
right versions of gcc-cross-canadian are used.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
diff --git a/meta/classes/multilib_global.bbclass \
b/meta/classes/multilib_global.bbclass index ed34404..612cfb6 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -30,7 +30,10 @@ def preferred_ml_updates(d):
override = ":virtclass-multilib-" + p
localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + \
override) bb.data.update_data(localdata)
- newname = localdata.expand(v).replace("PREFERRED_VERSION_", \
"PREFERRED_VERSION_" + p + '-') + if "-canadian-" in pkg:
+ newname = localdata.expand(v)
+ else:
+ newname = localdata.expand(v).replace("PREFERRED_VERSION_", \
"PREFERRED_VERSION_" + p + '-') if newname != v:
newval = localdata.expand(val)
d.setVar(newname, newval)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic