summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2015-06-04 15:48:13 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-06-08 14:15:24 +0200
commitaf7112d00f21f418a865abba04048a1fef104343 (patch)
tree267920bf820918b359b830c6500d15828fca0c3b
parent74f96955feca2301227b07e585fd47d26aab5e70 (diff)
downloadmeta-openembedded-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.inc9
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 26bac3310..0597be1cd 100644
--- a/meta-oe/recipes-core/llvm/llvm.inc
+++ b/meta-oe/recipes-core/llvm/llvm.inc
@@ -60,6 +60,9 @@ do_configure_prepend() {
60 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 60 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
61 sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp 61 sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp
62 62
63 # Fix the hardcoded libdir in llvm-config
64 sed -i 's:/lib\>:${base_libdir}:g' ${S}/tools/llvm-config/llvm-config.cpp
65
63 # Fails to build unless using separate directory from source 66 # Fails to build unless using separate directory from source
64 mkdir -p ${LLVM_BUILD_DIR} 67 mkdir -p ${LLVM_BUILD_DIR}
65 cd ${LLVM_BUILD_DIR} 68 cd ${LLVM_BUILD_DIR}
@@ -67,6 +70,10 @@ do_configure_prepend() {
67 70
68do_compile() { 71do_compile() {
69 cd ${LLVM_BUILD_DIR} 72 cd ${LLVM_BUILD_DIR}
73
74 # Fix libdir for multilib
75 sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config
76
70 oe_runmake \ 77 oe_runmake \
71 AR="${BUILD_AR}" \ 78 AR="${BUILD_AR}" \
72 CC="${BUILD_CC}" \ 79 CC="${BUILD_CC}" \
@@ -127,7 +134,7 @@ FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \
127 134
128PACKAGES_DYNAMIC = "^libllvm-.*$" 135PACKAGES_DYNAMIC = "^libllvm-.*$"
129 136
130INSANE_SKIP_libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so" 137INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so"
131 138
132python llvm_populate_packages() { 139python llvm_populate_packages() {
133 libdir = bb.data.expand('${libdir}', d) 140 libdir = bb.data.expand('${libdir}', d)