Skip to contentSkip to conversation

multilib_global: expand multilib pref values properly

PATCH New Christopher Larson 1 participant 1 message Jul 1, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/multilib_global.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/multilib_global.bbclass +1 -1
index 67bd70d..ed34404 100644
@@ -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):
Signature · 1 line
2.2.1