uclibc: Set MULTILIB_DIR based on baselib

PATCH New Richard Purdie 1 participant 1 message May 6, 2014

Share & tools

Richard Purdie

author

2014-05-06 13:50 UTC #0 lore raw

PATCH 1/1 uclibc: Set MULTILIB_DIR based on baselib

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 <[email protected]>

---

meta/recipes-core/uclibc/uclibc-git/uClibc.distro +1 -0

index c309e6f..6575482 100644
@@ -123,6 +123,7 @@ UCLIBC_HAS_GNU_GLOB=y
 SHARED_LIB_LOADER_PREFIX="/lib"
 RUNTIME_PREFIX="/"
 DEVEL_PREFIX="//usr"
+MULTILIB_DIR="lib"
 
 #
 # Security options

meta/recipes-core/uclibc/uclibc.inc +1 -0

index e00de62..a86ac3d 100644
@@ -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)}"