summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 14:50:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 13:00:34 +0100
commit79cacae0128ab54bb1a93a634161cc5bce5c78cc (patch)
tree4b8a39c7b5c3a88523614c8d554dae5ec4de35a8 /meta
parentd30a5c25025c1ffacc0df036c189c935c8d3d39a (diff)
downloadpoky-79cacae0128ab54bb1a93a634161cc5bce5c78cc.tar.gz
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. (From OE-Core rev: 665b03b338d8d710250bd92d6b9a227255f808f8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/uClibc.distro1
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index c309e6f79a..6575482b34 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
123SHARED_LIB_LOADER_PREFIX="/lib" 123SHARED_LIB_LOADER_PREFIX="/lib"
124RUNTIME_PREFIX="/" 124RUNTIME_PREFIX="/"
125DEVEL_PREFIX="//usr" 125DEVEL_PREFIX="//usr"
126MULTILIB_DIR="lib"
126 127
127# 128#
128# Security options 129# Security options
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index e00de62f90..a86ac3ddf7 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -81,6 +81,7 @@ configmangle = '/^KERNEL_HEADERS/d; \
81 s,^DOSTRIP.*,# DOSTRIP is not set,g; \ 81 s,^DOSTRIP.*,# DOSTRIP is not set,g; \
82 /_[EO]*ABI/d; \ 82 /_[EO]*ABI/d; \
83 /HAS_FPU/d; \ 83 /HAS_FPU/d; \
84 ${@["","s,.*MULTILIB_DIR.*,MULTILIB_DIR=\"${baselib}\",;"][d.getVar("baselib", True) != "lib"]} \
84 ' 85 '
85OE_FEATURES := "${@features_to_uclibc_conf(d)}" 86OE_FEATURES := "${@features_to_uclibc_conf(d)}"
86OE_DEL := "${@features_to_uclibc_del(d)}" 87OE_DEL := "${@features_to_uclibc_del(d)}"