From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 2 Jul 2018 16:03:21 +0000 (+0100)
Subject: multilib: Fix issues with some cross-canadian toolchain sysroots
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae48ee6627e6c1c4f1fcc4ead40edc968e64f7fe;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

multilib: Fix issues with some cross-canadian toolchain sysroots

MACHINE = "qemumips64"
MULTILIBS = "multilib:lib64 multilib:lib32"
DEFAULTTUNE = "mips64-n32"
DEFAULTTUNE_virtclass-multilib-lib64 = "mips64"
DEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2"

bitbake core-image-minimal -c populate_sdk

Results in gcc-cross-canadian-mips failing to build due to the use
of an incorrect sysroot, fix this. All nativesdk pieces should be in
the same sysroot (unprefixed).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 1dcd3502988..3831d2bab29 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -35,6 +35,8 @@ python multilib_virtclass_handler () {
         return
 
     if bb.data.inherits_class('cross-canadian', e.data):
+        # Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX
+        e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot")
         e.data.setVar("MLPREFIX", variant + "-")
         override = ":virtclass-multilib-" + variant
         e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)