mulitlib.bbclass: Ensure correct value of ALL_MULTILIB_PACKAGE_ARCHS is preserved

PATCH New Richard Purdie 1 participant 1 message Apr 14, 2012

Share & tools

Richard Purdie

author

2012-04-14 21:55 UTC #0 lore raw

PATCH 1/1 mulitlib.bbclass: Ensure correct value of ALL_MULTILIB_PACKAGE_ARCHS is preserved

The value of ALL_MULTILIB_PACKAGE_ARCHS needs to be consistent both in multilib extended recipes and in normal context. If this isn't the case it can lead to inconsistent configuration files at a minimum.

This patch ensures the value is preserved during the class extension code since computing it after that point is hard.

[YOCTO #2290]

Signed-off-by Richard Purdie <[email protected]>

---

meta/classes/multilib.bbclass +3 -0

index 61b7765..c2d2f85 100644
@@ -20,6 +20,9 @@ python multilib_virtclass_handler () {
         val=e.data.getVar(name, True)
         if val:
             e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
+
+    # Expand this since this won't work correctly once we set a multilib into place
+    e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True))
  
     override = ":virtclass-multilib-" + variant