[CONSOLIDATED,PULL,21/26] bitbake.conf multilib.conf: move the definition of baselib

Submitted by Saul Wold on Dec. 22, 2011, 7:55 a.m.

Details

Message ID f806badf31a3ca4653ec580f207c29d7689e72ec.1324540323.git.sgw@linux.intel.com
State New
Headers show

Commit Message

Saul Wold Dec. 22, 2011, 7:55 a.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

The baselib value varies with tune, even when multilib is not
configured. This commit makes the logic to find value of baselib
based on the tune available outside of multilib setup.

This Fixes bug: [YOCTO #1854]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/conf/bitbake.conf  |    2 +-
 meta/conf/multilib.conf |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1c21616..700a40a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -9,7 +9,7 @@ 
 # Used by multilib code to change the library paths
 baselib = "${BASELIB}"
 baselib[vardepvalue] = "${baselib}"
-BASELIB = "lib"
+BASELIB = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}"
 BASELIB_powerpc64 = "lib64"
 
 # Path prefixes
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 87a3d86..a9448df 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -1,6 +1,4 @@ 
 
-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"