From: Richard Purdie Date: Fri, 31 Jul 2015 10:29:35 +0000 (+0100) Subject: multilib_global: Fix PREFERRED_VERSION mapping for gcc-cross-canadian X-Git-Tag: 2015-10~1029 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a;p=openembedded-core.git multilib_global: Fix PREFERRED_VERSION mapping for gcc-cross-canadian Our multilib cross toolchains have 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 --- diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index ed34404117..612cfb6919 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)