summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 13:08:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 15:38:31 +0100
commitaeea22da699b276a97ca1a17e3c53176c9afd9de (patch)
treea5ca8c74c4fdaaed1ed9fd58c08ea1f225b33e46 /meta
parentb4c23fce3eadaff8fc621d38759d493cd03cc131 (diff)
downloadopenembedded-core-aeea22da699b276a97ca1a17e3c53176c9afd9de.tar.gz
openembedded-core-aeea22da699b276a97ca1a17e3c53176c9afd9de.tar.bz2
openembedded-core-aeea22da699b276a97ca1a17e3c53176c9afd9de.tar.xz
openembedded-core-aeea22da699b276a97ca1a17e3c53176c9afd9de.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross.bbclass7
-rw-r--r--meta/conf/bitbake.conf15
2 files changed, 14 insertions, 8 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index f9fd07a9a..81358ec8d 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}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 975e24c07..e768df5f7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -1,6 +1,13 @@
##################################################################
# Standard target filesystem paths.
##################################################################
+#
+# If changing these values, beware that native/cross/nativesdk bbclass
+# files may also need changes to keep in sync.
+#
+
+# Used by multilib code to change the library paths
+baselib = "lib"
# Path prefixes
export base_prefix = ""
@@ -10,7 +17,7 @@ export exec_prefix = "/usr"
# Base paths
export base_bindir = "${base_prefix}/bin"
export base_sbindir = "${base_prefix}/sbin"
-export base_libdir = "${base_prefix}/lib"
+export base_libdir = "${base_prefix}/${baselib}"
# Architecture independent paths
export datadir = "${prefix}/share"
@@ -26,13 +33,11 @@ export docdir = "${datadir}/doc"
export bindir = "${exec_prefix}/bin"
export sbindir = "${exec_prefix}/sbin"
export libexecdir = "${exec_prefix}/libexec"
-export libdir = "${exec_prefix}/lib"
+export libdir = "${exec_prefix}/${baselib}"
export includedir = "${exec_prefix}/include"
export oldincludedir = "${exec_prefix}/include"
-#
-# These must match the various bbclass layout definitions
-#
+# Linkage between native/cross/nativesdk layouts
base_bindir_native = "/bin"
base_sbindir_native = "/sbin"
sysconfdir_native = "/etc"