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>
This commit is contained in:
parent
f5e9a398b9
commit
c18aa8d065
|
@ -223,3 +223,8 @@ NO32LIBS = "1"
|
||||||
|
|
||||||
# Uncomment this if your host distribution provides the help2man tool.
|
# Uncomment this if your host distribution provides the help2man tool.
|
||||||
#ASSUME_PROVIDED += "help2man-native"
|
#ASSUME_PROVIDED += "help2man-native"
|
||||||
|
|
||||||
|
# Uncomment the following lines to enable multilib builds
|
||||||
|
#require conf/multilib.conf
|
||||||
|
#MULTILIBS = "multilib:lib32"
|
||||||
|
#TUNENAME_virtclass-multilib-lib32 = "x86"
|
||||||
|
|
|
@ -9,7 +9,7 @@ def autotools_dep_prepend(d):
|
||||||
return deps
|
return deps
|
||||||
deps += 'autoconf-native automake-native help2man-native '
|
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 '
|
deps += 'libtool-native '
|
||||||
if not bb.data.inherits_class('native', d) \
|
if not bb.data.inherits_class('native', d) \
|
||||||
and not bb.data.inherits_class('cross', d) \
|
and not bb.data.inherits_class('cross', d) \
|
||||||
|
|
|
@ -54,4 +54,3 @@ do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE
|
||||||
do_install () {
|
do_install () {
|
||||||
oe_runmake 'DESTDIR=${D}' install
|
oe_runmake 'DESTDIR=${D}' install
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -571,12 +571,13 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
|
||||||
|
|
||||||
cnf = bb.data.getVar('EXTRA_OECONF', d, True) or ""
|
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:
|
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):
|
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"
|
gt = "gettext-native"
|
||||||
elif bb.data.inherits_class('cross-canadian', d):
|
elif bb.data.inherits_class('cross-canadian', d):
|
||||||
gt = "gettext-nativesdk"
|
gt = "gettext-nativesdk"
|
||||||
else:
|
else:
|
||||||
gt = "virtual/gettext"
|
gt = "virtual/" + ml + "gettext"
|
||||||
deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
|
deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
|
||||||
if gt not in deps:
|
if gt not in deps:
|
||||||
for config in configs:
|
for config in configs:
|
||||||
|
|
|
@ -168,6 +168,17 @@ python () {
|
||||||
bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d)
|
bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d)
|
||||||
else:
|
else:
|
||||||
d.setVar("PACKAGERDEPTASK", "")
|
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):
|
def splitfile(file, debugfile, debugsrcdir, d):
|
||||||
|
|
|
@ -735,3 +735,4 @@ BB_SIGNATURE_HANDLER ?= "basic"
|
||||||
BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"
|
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"
|
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 ??= ""
|
||||||
|
|
|
@ -5,11 +5,9 @@ SECTION = "base"
|
||||||
LICENSE = "AFL-2 | GPLv2+"
|
LICENSE = "AFL-2 | GPLv2+"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
|
LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
|
||||||
file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
|
file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
|
||||||
x11deps = "virtual/libx11 libsm"
|
DEPENDS = "expat virtual/libintl virtual/libx11 libsm"
|
||||||
basedeps = "expat virtual/libintl"
|
DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
|
||||||
DEPENDS = "${basedeps} ${x11deps}"
|
DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
|
||||||
DEPENDS_virtclass-native = "${basedeps}"
|
|
||||||
DEPENDS_virtclass-nativesdk = "${basedeps} virtual/libx11"
|
|
||||||
|
|
||||||
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
|
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
|
||||||
file://tmpdir.patch; \
|
file://tmpdir.patch; \
|
||||||
|
|
|
@ -41,9 +41,9 @@ do_install () {
|
||||||
chmod +x ${D}${base_libdir}/libgcc_s.so.*
|
chmod +x ${D}${base_libdir}/libgcc_s.so.*
|
||||||
}
|
}
|
||||||
|
|
||||||
do_package_write_ipk[depends] += "virtual/libc:do_package"
|
do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package"
|
||||||
do_package_write_deb[depends] += "virtual/libc:do_package"
|
do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package"
|
||||||
do_package_write_rpm[depends] += "virtual/libc:do_package"
|
do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
|
||||||
|
|
||||||
BBCLASSEXTEND = "nativesdk"
|
BBCLASSEXTEND = "nativesdk"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue