* [PATCH] uclibc: Set MULTILIB_DIR based on baselib
@ 2014-05-06 13:50 Richard Purdie
0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2014-05-06 13:50 UTC (permalink / raw)
To: openembedded-core
baselib contains the current "lib" value so pass this into
uclibc's configration to allow multilib builds to work correctly.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index c309e6f..6575482 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
@@ -123,6 +123,7 @@ UCLIBC_HAS_GNU_GLOB=y
SHARED_LIB_LOADER_PREFIX="/lib"
RUNTIME_PREFIX="/"
DEVEL_PREFIX="//usr"
+MULTILIB_DIR="lib"
#
# Security options
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index e00de62..a86ac3d 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -81,6 +81,7 @@ configmangle = '/^KERNEL_HEADERS/d; \
s,^DOSTRIP.*,# DOSTRIP is not set,g; \
/_[EO]*ABI/d; \
/HAS_FPU/d; \
+ ${@["","s,.*MULTILIB_DIR.*,MULTILIB_DIR=\"${baselib}\",;"][d.getVar("baselib", True) != "lib"]} \
'
OE_FEATURES := "${@features_to_uclibc_conf(d)}"
OE_DEL := "${@features_to_uclibc_del(d)}"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-05-06 13:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-06 13:50 [PATCH] uclibc: Set MULTILIB_DIR based on baselib Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox