From e3f5d7dee070464c636c4cb38844e098ec9d75f8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 13 Feb 2013 00:21:53 +0000 Subject: [PATCH] multilib: Fix an OVERRIDES expansion order issue There were problems where a SRC_URI with: SRC_URI_append_powerpc = " xxx" SRC_URI_append_powerpc64 = " xxx2" would end up with *both* xxx and xxx2 being added when using a multilib which is clearly incorrect and undesirable. The issue is that OVERRIDES has virtclass-multilib-xxxx added to it, this eventually changed DEFAULTTUNE which then changes TRANSLATED_TARGET_ARCH which is in OVERRIDES meaning we then need to re-evaluate the overides and the TRANSLATED_TARGET_ARCH gets applied twice since once you apply an override, it doesn't get undone. Expanding DEFAULTTUNE to the correct value in advance avoids the issue and means only the correct overrides get applied. [YOCTO #3874] (From OE-Core rev: 920c9024f5a47ad14670067f910450983bae2aa7) Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index a999b69b2a..3cc470ec4c 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -52,6 +52,11 @@ python multilib_virtclass_handler () { e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + + # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data + newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) + if newtune: + e.data.setVar("DEFAULTTUNE", newtune) } addhandler multilib_virtclass_handler