From 5d9453049915db48ec4b5972e12287417ebb61a2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 Jun 2011 17:27:03 +0800 Subject: 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) Signed-off-by: Yu Ke Signed-off-by: Xu Dongxiao Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 meta/classes/multilib.bbclass (limited to 'meta/classes/multilib.bbclass') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass new file mode 100644 index 000000000..6e1669fb7 --- /dev/null +++ b/meta/classes/multilib.bbclass @@ -0,0 +1,89 @@ +python multilib_virtclass_handler () { + if not isinstance(e, bb.event.RecipePreFinalise): + return + + cls = e.data.getVar("BBEXTENDCURR", True) + variant = e.data.getVar("BBEXTENDVARIANT", True) + if cls != "multilib" or not variant: + return + + override = ":virtclass-multilib-" + variant + + e.data.setVar("MLPREFIX", variant + "-") + e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) + e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) + e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant) + e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) +} + +addhandler multilib_virtclass_handler + +STAGINGCC_prepend = "${BBEXTENDVARIANT}-" + +python __anonymous () { + variant = d.getVar("BBEXTENDVARIANT", True) + + def extend_name(name): + if name.startswith("virtual/"): + subs = name.split("/", 1)[1] + if not subs.startswith(variant): + return "virtual/" + variant + "-" + subs + return name + if not name.startswith(variant): + return variant + "-" + name + return name + + def map_dependencies(varname, d, suffix = ""): + if suffix: + varname = varname + "_" + suffix + deps = d.getVar(varname, True) + if not deps: + return + deps = bb.utils.explode_deps(deps) + newdeps = [] + for dep in deps: + if dep.endswith(("-native", "-native-runtime")): + newdeps.append(dep) + else: + newdeps.append(extend_name(dep)) + d.setVar(varname, " ".join(newdeps)) + + def map_variable(varname, d): + var = d.getVar(varname, True) + if not var: + return + var = var.split() + newvar = [] + for v in var: + newvar.append(extend_name(v)) + d.setVar(varname, " ".join(newvar)) + + pkgs = [] + pkgrename = {} + for pkg in (d.getVar("PACKAGES", True) or "").split(): + if pkg.startswith(variant): + pkgs.append(pkg) + continue + pkgrename[pkg] = extend_name(pkg) + pkgs.append(pkgrename[pkg]) + + if pkgrename: + d.setVar("PACKAGES", " ".join(pkgs)) + for pkg in pkgrename: + for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY", "DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]: + d.renameVar("%s_%s" % (subs, pkg), "%s_%s" % (subs, pkgrename[pkg])) + + map_dependencies("DEPENDS", d) + for pkg in (d.getVar("PACKAGES", True).split() + [""]): + map_dependencies("RDEPENDS", d, pkg) + map_dependencies("RRECOMMENDS", d, pkg) + map_dependencies("RSUGGESTS", d, pkg) + map_dependencies("RPROVIDES", d, pkg) + map_dependencies("RREPLACES", d, pkg) + map_dependencies("RCONFLICTS", d, pkg) + map_dependencies("PKG", d, pkg) + + map_variable("PROVIDES", d) + map_variable("PACKAGES_DYNAMIC", d) + map_variable("PACKAGE_INSTALL", d) +} -- cgit v1.2.3