llvm: correct fix for the multilib libdir
PATCH 1/1 llvm: correct fix for the multilib libdir
* If llvm.inc is used for native and nativesdk class packages, the resulting llvm-config is broken since "${base_libdir}" is prefixed with the full patch to sysroot
* Replace "/lib" with "/${baselib}" instead of "${base_libdir}" as "${base_libdir}" is the full path and "${baselib}" is the name of the multilib directory.
--- meta-oe/recipes-core/llvm/llvm.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-core/llvm/llvm.inc +2 -2
@@ -61,7 +61,7 @@ do_configure_prepend() { 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 + sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp # Fails to build unless using separate directory from source mkdir -p ${LLVM_BUILD_DIR}
@@ -72,7 +72,7 @@ do_compile() { cd ${LLVM_BUILD_DIR} # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config + sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config oe_runmake \ AR="${BUILD_AR}" \
Signature · 1 line
1.9.1
Quoted 8 lines · Jacob Stiffler
* If llvm.inc is used for native and nativesdk class packages, the resulting llvm-config is broken since "${base_libdir}" is prefixed with the full patch to sysroot
* Replace "/lib" with "/${baselib}" instead of "${base_libdir}" as "${base_libdir}" is the full path and "${baselib}" is the name of the multilib directory.Signed-off-by Jacob Stiffler <[email protected]>
Quoted 34 lines
--- meta-oe/recipes-core/llvm/llvm.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-oe/recipes-core/llvm/llvm.inc +2
-2@@ -61,7 +61,7 @@ do_configure_prepend() { 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 + sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp # Fails to build unless using separate directory from source mkdir -p ${LLVM_BUILD_DIR}@@ -72,7 +72,7 @@ do_compile() { cd ${LLVM_BUILD_DIR} # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config + sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config oe_runmake \ AR="${BUILD_AR}" \Signature · 7 lines
1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Ping? I see it in master-next, what's an ETA on merging it to master?
Quoted 53 lines · Denys Dmytriyenko
Quoted 8 lines · Jacob Stiffler
* If llvm.inc is used for native and nativesdk class packages, the resulting llvm-config is broken since "${base_libdir}" is prefixed with the full patch to sysroot
* Replace "/lib" with "/${baselib}" instead of "${base_libdir}" as "${base_libdir}" is the full path and "${baselib}" is the name of the multilib directory.Signed-off-by Jacob Stiffler <[email protected]>Tested-by Denys Dmytriyenko <[email protected]>Quoted 34 lines
--- meta-oe/recipes-core/llvm/llvm.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-oe/recipes-core/llvm/llvm.inc +2
-2@@ -61,7 +61,7 @@ do_configure_prepend() { 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 + sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp # Fails to build unless using separate directory from source mkdir -p ${LLVM_BUILD_DIR}@@ -72,7 +72,7 @@ do_compile() { cd ${LLVM_BUILD_DIR} # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config + sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config oe_runmake \ AR="${BUILD_AR}" \Signature · 7 lines
1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-develSignature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel