From 375cf1561c0c9356a629495256423b44ddced9b6 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 29 Jul 2011 22:21:58 +0800 Subject: utils.bbclass/multilib.class: Added misc supporting functions. 1. Added variable MULTILIB_VARIANTS to store all the instance variants for multilib extend. 2. Added function all_multilib_tune_values to collect the variable values for all multilib instance. 3. multilib bbclass handler will save the orignal value of all variables defined in MULTILIB_SAVE_VARNAME. (From OE-Core rev: 18bba910e04bff75460f408e4557d4bae21ad592) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 1 + meta/conf/multilib.conf | 3 +++ 2 files changed, 4 insertions(+) (limited to 'meta/conf') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7bb68b8dc5..b30951648d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -749,3 +749,4 @@ BB_HASHTASK_WHITELIST ?= "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-inter 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 ??= "" +MULTILIB_VARIANTS ??= "" diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index f2a2002355..36793d247e 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -1,6 +1,9 @@ baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}" +MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" +MULTILIB_SAVE_VARNAME = "DEFAULTTUNE" + MULTILIBS ??= "multilib:lib32" BBCLASSEXTEND_append_pn-acl = " ${MULTILIBS}" -- cgit v1.2.3-54-g00ecf