[oe-commits] Richard Purdie : multilib_global: Fix PREFERRED_VERSION mapping for gcc-cross-canadian
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 1 06:35:15 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Jul 31 11:29:35 2015 +0100
multilib_global: Fix PREFERRED_VERSION mapping for gcc-cross-canadian
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>
---
meta/classes/multilib_global.bbclass | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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)
More information about the Openembedded-commits
mailing list