diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2015-06-04 15:48:13 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-08 14:15:24 +0200 |
| commit | af7112d00f21f418a865abba04048a1fef104343 (patch) | |
| tree | 267920bf820918b359b830c6500d15828fca0c3b | |
| parent | 74f96955feca2301227b07e585fd47d26aab5e70 (diff) | |
| download | meta-openembedded-contrib-af7112d00f21f418a865abba04048a1fef104343.tar.gz | |
llvm: fix libdir for multilib
Fix the hardcoded libdir in llvm-config and Makefile.config
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-core/llvm/llvm.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc index 26bac33105..0597be1cd8 100644 --- a/meta-oe/recipes-core/llvm/llvm.inc +++ b/meta-oe/recipes-core/llvm/llvm.inc @@ -60,6 +60,9 @@ do_configure_prepend() { sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp + # Fix the hardcoded libdir in llvm-config + sed -i 's:/lib\>:${base_libdir}:g' ${S}/tools/llvm-config/llvm-config.cpp + # Fails to build unless using separate directory from source mkdir -p ${LLVM_BUILD_DIR} cd ${LLVM_BUILD_DIR} @@ -67,6 +70,10 @@ do_configure_prepend() { do_compile() { cd ${LLVM_BUILD_DIR} + + # Fix libdir for multilib + sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config + oe_runmake \ AR="${BUILD_AR}" \ CC="${BUILD_CC}" \ @@ -127,7 +134,7 @@ FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \ PACKAGES_DYNAMIC = "^libllvm-.*$" -INSANE_SKIP_libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so" +INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so" python llvm_populate_packages() { libdir = bb.data.expand('${libdir}', d) |