mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

llvm: fix libdir for multilib

Browse Source 
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>
This commit is contained in:
Yi Zhao
2015-06-04 15:48:13 +08:00
committed by Martin Jansa
parent 74f96955fe
commit af7112d00f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/llvm/llvm.inc
+8 -1
View File
@@ -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 -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 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 # Fails to build unless using separate directory from source
mkdir -p ${LLVM_BUILD_DIR} mkdir -p ${LLVM_BUILD_DIR}
cd ${LLVM_BUILD_DIR} cd ${LLVM_BUILD_DIR}
@@ -67,6 +70,10 @@ do_configure_prepend() {
do_compile() { do_compile() {
cd ${LLVM_BUILD_DIR} cd ${LLVM_BUILD_DIR}
# Fix libdir for multilib
sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config
oe_runmake \ oe_runmake \
AR="${BUILD_AR}" \ AR="${BUILD_AR}" \
CC="${BUILD_CC}" \ CC="${BUILD_CC}" \
@@ -127,7 +134,7 @@ FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \
PACKAGES_DYNAMIC = "^libllvm-.*$" 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() { python llvm_populate_packages() {
libdir = bb.data.expand('${libdir}', d) libdir = bb.data.expand('${libdir}', d)