summaryrefslogtreecommitdiffstats
path: root/meta/classes/insane.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-07 17:27:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 16:18:40 +0100
commitc18aa8d065c389d2f2038da07704b004a3ece9d4 (patch)
tree5d56cc511e1377c9aa1d10b304c5c79c67928f4a /meta/classes/insane.bbclass
parentf5e9a398b9200a64c2543fc5cfe4777263c5628e (diff)
downloadpoky-c18aa8d065c389d2f2038da07704b004a3ece9d4.tar.gz
multilib: Add support for compiling recipes against multiple ABIs
This patch adds the core multilib class which can be used along with a parameter specifying the mutlilib to use in BBCLASSEXTEND. The MLPREFIX variable is added and can be used in cases where its too difficult to dynmaically work out where a mutltilib prefix is needed to be added to a variable. This includes: * SHLIBSDIR and PACKAGE_ARCH fixes from Lianhao Lu. * PACKAGE_DYNAMIC mapping from Yu Ke * PACKAGE_INSTALL mapping from Yu Ke * RPROVIDES mapping from Yu Ke * TARGET_VENDOR fix from Mark Hatle * Ignorning *-native-runtime dependnecies as well as *-native from Yu Ke * Map PKG and ALLOW_EMPTY from Dongxiao Xu * Ensure RCONFLICTS and PKG field dependencies are remapped (from Dongxiao Xu) * Ensure PN and MLPREFIX are set at the same time to ensure consistent BPN values (Yu Ke) (From OE-Core rev: 5d9453049915db48ec4b5972e12287417ebb61a2) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/insane.bbclass')
-rw-r--r--meta/classes/insane.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index d56c9edcc2..5fb0d98baf 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -571,12 +571,13 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
571 571
572 cnf = bb.data.getVar('EXTRA_OECONF', d, True) or "" 572 cnf = bb.data.getVar('EXTRA_OECONF', d, True) or ""
573 if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True) and "--disable-nls" not in cnf: 573 if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True) and "--disable-nls" not in cnf:
574 ml = d.getVar("MLPREFIX", True) or ""
574 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d): 575 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
575 gt = "gettext-native" 576 gt = "gettext-native"
576 elif bb.data.inherits_class('cross-canadian', d): 577 elif bb.data.inherits_class('cross-canadian', d):
577 gt = "gettext-nativesdk" 578 gt = "gettext-nativesdk"
578 else: 579 else:
579 gt = "virtual/gettext" 580 gt = "virtual/" + ml + "gettext"
580 deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "") 581 deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
581 if gt not in deps: 582 if gt not in deps:
582 for config in configs: 583 for config in configs: