summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 11:29:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 07:34:05 +0100
commitac692c6af7096c92fe8494ef11dcdfd97e61f268 (patch)
tree7e9703197ab4e4d19df9c3693eb349e83f2b6a1b /meta
parentd3f991a5392cc1ce9332fa8339cbf37228ab56a0 (diff)
downloadpoky-ac692c6af7096c92fe8494ef11dcdfd97e61f268.tar.gz
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. (From OE-Core rev: c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib_global.bbclass5
1 files changed, 4 insertions, 1 deletions
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):
30 override = ":virtclass-multilib-" + p 30 override = ":virtclass-multilib-" + p
31 localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) 31 localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override)
32 bb.data.update_data(localdata) 32 bb.data.update_data(localdata)
33 newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-') 33 if "-canadian-" in pkg:
34 newname = localdata.expand(v)
35 else:
36 newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-')
34 if newname != v: 37 if newname != v:
35 newval = localdata.expand(val) 38 newval = localdata.expand(val)
36 d.setVar(newname, newval) 39 d.setVar(newname, newval)