diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-07 17:27:03 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 16:15:21 +0100 |
| commit | 5d9453049915db48ec4b5972e12287417ebb61a2 (patch) | |
| tree | 723ff1389fef55dba797a15be90a70eac47d630d /meta/conf | |
| parent | b4ec5c27b51c15e8bde7ca2597329c4f5b801240 (diff) | |
| download | openembedded-core-contrib-5d9453049915db48ec4b5972e12287417ebb61a2.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)
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/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | meta/conf/local.conf.sample | 5 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 24 |
3 files changed, 30 insertions, 0 deletions
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/conf/local.conf.sample b/meta/conf/local.conf.sample index c378fb7bd3..97789ad1ff 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -193,3 +193,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/conf/multilib.conf b/meta/conf/multilib.conf new file mode 100644 index 0000000000..894b7a51f7 --- /dev/null +++ b/meta/conf/multilib.conf @@ -0,0 +1,24 @@ + +baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}" + +MULTILIBS ??= "multilib:lib32" +BBCLASSEXTEND_append_pn-linux-libc-headers = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-eglibc-initial = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-eglibc = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-libgcc = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-libtool-cross = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-zlib = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-binutils-cross = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-busybox = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-update-rc.d = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-util-linux = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gettext = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-bash = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-ncurses = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-expat = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-eglibc-locale = " ${MULTILIBS}" + |