From dffe253336f4cc1999ad2a2323d346bfa5f22047 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 22 Jul 2011 13:08:58 +0100 Subject: bitbake.conf/cross.bbclass: Add ability to dynamically change library location Add the ability to dynamically change the library directory from "lib" to other values. This allows the tune files to specifiy altnerative ABIs which can be dynamically enabled by the multilib BBCLASSEXTEND code. A variety of approaches have been attempted with this, the immediate expansions in cross.bbclass being problematic as they are they are expanded before the bbclass extend event hander runs. This approach ensures the ${baselib} variable is retained in the expressions resolving that complication. Derived from some ideas from Mark Hatle. (From OE-Core rev: aeea22da699b276a97ca1a17e3c53176c9afd9de) Signed-off-by: Richard Purdie --- meta/classes/cross.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes/cross.bbclass') diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index f9fd07a9a2..81358ec8dd 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -38,11 +38,12 @@ DEPENDS_GETTEXT = "gettext-native" # Path mangling needed by the cross packaging # Note that we use := here to ensure that libdir and includedir are # target paths. -target_libdir := "${libdir}" -target_includedir := "${includedir}" -target_base_libdir := "${base_libdir}" +target_base_prefix := "${base_prefix}" target_prefix := "${prefix}" target_exec_prefix := "${exec_prefix}" +target_base_libdir = "${target_base_prefix}/${baselib}" +target_libdir = "${target_exec_prefix}/${baselib}" +target_includedir := "${includedir}" # Overrides for paths CROSS_TARGET_SYS_DIR = "${MULTIMACH_TARGET_SYS}" -- cgit v1.2.3-54-g00ecf