From c18aa8d065c389d2f2038da07704b004a3ece9d4 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) (From OE-Core rev: 5d9453049915db48ec4b5972e12287417ebb61a2) Signed-off-by: Yu Ke Signed-off-by: Xu Dongxiao Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta-yocto/conf/local.conf.sample | 5 +++++ meta/classes/autotools.bbclass | 2 +- meta/classes/cross.bbclass | 1 - meta/classes/insane.bbclass | 3 ++- meta/classes/package.bbclass | 11 +++++++++++ meta/conf/bitbake.conf | 1 + meta/recipes-core/dbus/dbus.inc | 8 +++----- meta/recipes-devtools/gcc/libgcc_4.6.bb | 6 +++--- 8 files changed, 26 insertions(+), 11 deletions(-) diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample index 64b61ba92b..b6993841fb 100644 --- a/meta-yocto/conf/local.conf.sample +++ b/meta-yocto/conf/local.conf.sample @@ -223,3 +223,8 @@ NO32LIBS = "1" # Uncomment this if your host distribution provides the help2man tool. #ASSUME_PROVIDED += "help2man-native" + +# Uncomment the following lines to enable multilib builds +#require conf/multilib.conf +#MULTILIBS = "multilib:lib32" +#TUNENAME_virtclass-multilib-lib32 = "x86" diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index ed5637ef3b..e5c13ae691 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -9,7 +9,7 @@ def autotools_dep_prepend(d): return deps deps += 'autoconf-native automake-native help2man-native ' - if not pn in ['libtool', 'libtool-native', 'libtool-cross']: + if not pn in ['libtool', 'libtool-native'] and not pn.endswith("libtool-cross"): deps += 'libtool-native ' if not bb.data.inherits_class('native', d) \ and not bb.data.inherits_class('cross', d) \ diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 050d63e412..e19614f280 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -54,4 +54,3 @@ do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE do_install () { oe_runmake 'DESTDIR=${D}' install } - 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) cnf = bb.data.getVar('EXTRA_OECONF', d, True) or "" 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: + ml = d.getVar("MLPREFIX", True) or "" 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): gt = "gettext-native" elif bb.data.inherits_class('cross-canadian', d): gt = "gettext-nativesdk" else: - gt = "virtual/gettext" + gt = "virtual/" + ml + "gettext" deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "") if gt not in deps: for config in configs: diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 076a532360..0caab6dcf9 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -168,6 +168,17 @@ python () { bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d) else: d.setVar("PACKAGERDEPTASK", "") + + multilib_archs = [] + multilibs= d.getVar('MULTILIBS', True) or "" + if multilibs: + for ext in multilibs.split(): + eext = ext.split(':') + if len(eext) > 1: + if eext[0] == 'multilib': + multilib_archs.append('ml' + eext[1]) + + d.setVar("MULTILIB_ARCHS", ' '.join(multilib_archs)) } def splitfile(file, debugfile, debugsrcdir, d): diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 46a9a82198..6e109ecd1e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -735,3 +735,4 @@ BB_SIGNATURE_HANDLER ?= "basic" BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)" BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH USERNAME STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE" +MLPREFIX ??= "" diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 5f9a8a3081..6b76cba959 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -5,11 +5,9 @@ SECTION = "base" LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" -x11deps = "virtual/libx11 libsm" -basedeps = "expat virtual/libintl" -DEPENDS = "${basedeps} ${x11deps}" -DEPENDS_virtclass-native = "${basedeps}" -DEPENDS_virtclass-nativesdk = "${basedeps} virtual/libx11" +DEPENDS = "expat virtual/libintl virtual/libx11 libsm" +DEPENDS_virtclass-native = "expat-native virtual/libintl-native" +DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb index 6a77ce4653..a6e1146be9 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.6.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb @@ -41,9 +41,9 @@ do_install () { chmod +x ${D}${base_libdir}/libgcc_s.so.* } -do_package_write_ipk[depends] += "virtual/libc:do_package" -do_package_write_deb[depends] += "virtual/libc:do_package" -do_package_write_rpm[depends] += "virtual/libc:do_package" +do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package" +do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package" +do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf