[oe-commits] Christopher Larson : multilib_global: expand multilib pref values properly

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 4d208ebacb3a5d189998ac9be6d1a454c45aa975
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4d208ebacb3a5d189998ac9be6d1a454c45aa975

Author: Christopher Larson <kergoth at gmail.com>
Date:   Wed Jul  1 08:18:21 2015 -0700

multilib_global: expand multilib pref values properly

This ensures that in cases where the preference value changes when the
multilib override is applied, we correctly expand it in that context.

For example, for `PREFERRED_PROVIDER_${TARGET_PREFIX}gcc
= "gcc-external-cross-${TARGET_ARCH}"`, when it sets the prefixed version of
this, we want TARGET_ARCH expanded with the multilib applied, otherwise the
arch suffix will be incorrect for that context.

We ran into this trying to use preferences in meta-sourcery along with
multilibs. We worked around it there via PNBLACKLIST, but this fix should
still go into the core.

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/multilib_global.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index 67bd70d..ed34404 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -84,7 +84,7 @@ def preferred_ml_updates(d):
             # implement alternative multilib name
             newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg)
             if not d.getVar(newname, False):
-                d.setVar(newname, newval)
+                d.setVar(newname, localdata.expand(newval))
         # Avoid future variable key expansion
         provexp = d.expand(prov)
         if prov != provexp and d.getVar(prov, False):