Patchwork uclibc: Set MULTILIB_DIR based on baselib

login
register
mail settings
Submitter Richard Purdie
Date May 6, 2014, 1:50 p.m.
Message ID <1399384224.12731.153.camel@ted>
Download mbox | patch
Permalink /patch/71609/
State Accepted
Commit 79cacae0128ab54bb1a93a634161cc5bce5c78cc
Headers show

Comments

Richard Purdie - May 6, 2014, 1:50 p.m.
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>
---

Patch

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)}"