diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 14:50:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-08 12:56:42 +0100 |
| commit | 665b03b338d8d710250bd92d6b9a227255f808f8 (patch) | |
| tree | 347b5285b16d06c6b6b8f074de690b1cef94cdb7 | |
| parent | 054151c77dae51e2826eeac9b9ae2de3a08f0bb6 (diff) | |
| download | openembedded-core-665b03b338d8d710250bd92d6b9a227255f808f8.tar.gz openembedded-core-665b03b338d8d710250bd92d6b9a227255f808f8.tar.bz2 openembedded-core-665b03b338d8d710250bd92d6b9a227255f808f8.zip | |
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 <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 1 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc.inc | 1 |
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 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 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; \ 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)}" |