multilib.bbclass: save multilib variables before executing the gcc-cross-canadian statements
PATCH 1/2 multilib.bbclass: save multilib variables before executing the gcc-cross-canadian statements
Signed-off-by Constantin Musca <[email protected]>
--- meta/classes/multilib.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
meta/classes/multilib.bbclass +6 -5
@@ -15,6 +15,12 @@ python multilib_virtclass_handler () { if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data): raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") + save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" + for name in save_var_name.split(): + val=e.data.getVar(name, True) + if val: + e.data.setVar(name + "_MULTILIB_ORIGINAL", val) + if bb.data.inherits_class('image', e.data): e.data.setVar("MLPREFIX", variant + "-") e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
@@ -36,11 +42,6 @@ python multilib_virtclass_handler () { if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups") - save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" - for name in save_var_name.split(): - 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))
Signature · 1 line
1.7.11.7
PATCH 2/2 gcc-cross-canadian: enable multilib support
Signed-off-by Constantin Musca <[email protected]>
--- meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 1 + meta/recipes-devtools/gcc/gcc-multilib-config.inc | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-devtools/gcc/gcc-4.7.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r17" +PR = "r18" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.7.1
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +1 -0
@@ -6,3 +6,4 @@ BPN = "gcc" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" +GCCMULTILIB = "--enable-multilib"
meta/recipes-devtools/gcc/gcc-multilib-config.inc +2 -1
@@ -41,7 +41,8 @@ python gcc_multilib_setup() { return mlprefix = d.getVar('MLPREFIX', True) - if ('%sgcc' % mlprefix) != d.getVar('PN', True): + pn = d.getVar('PN', True) + if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')): return
Signature · 1 line
1.7.11.7