* [meta-oe][PATCH] llvm: correct fix for the multilib libdir
@ 2016-04-11 21:32 Jacob Stiffler
2016-04-12 5:09 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Jacob Stiffler @ 2016-04-11 21:32 UTC (permalink / raw)
To: openembedded-devel
* 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 <j-stiffler@ti.com>
---
meta-oe/recipes-core/llvm/llvm.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc
index 31b2db4..02d4617 100644
--- a/meta-oe/recipes-core/llvm/llvm.inc
+++ b/meta-oe/recipes-core/llvm/llvm.inc
@@ -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}" \
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [meta-oe][PATCH] llvm: correct fix for the multilib libdir
2016-04-11 21:32 [meta-oe][PATCH] llvm: correct fix for the multilib libdir Jacob Stiffler
@ 2016-04-12 5:09 ` Denys Dmytriyenko
2016-04-20 18:23 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2016-04-12 5:09 UTC (permalink / raw)
To: openembedded-devel
On Mon, Apr 11, 2016 at 05:32:30PM -0400, Jacob Stiffler wrote:
> * 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 <j-stiffler@ti.com>
Acked-by: Denys Dmytriyenko <denys@ti.com>
Tested-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-oe/recipes-core/llvm/llvm.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc
> index 31b2db4..02d4617 100644
> --- a/meta-oe/recipes-core/llvm/llvm.inc
> +++ b/meta-oe/recipes-core/llvm/llvm.inc
> @@ -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}" \
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [meta-oe][PATCH] llvm: correct fix for the multilib libdir
2016-04-12 5:09 ` Denys Dmytriyenko
@ 2016-04-20 18:23 ` Denys Dmytriyenko
0 siblings, 0 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2016-04-20 18:23 UTC (permalink / raw)
To: openembedded-devel
Ping? I see it in master-next, what's an ETA on merging it to master?
On Tue, Apr 12, 2016 at 01:09:10AM -0400, Denys Dmytriyenko wrote:
> On Mon, Apr 11, 2016 at 05:32:30PM -0400, Jacob Stiffler wrote:
> > * 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 <j-stiffler@ti.com>
>
> Acked-by: Denys Dmytriyenko <denys@ti.com>
> Tested-by: Denys Dmytriyenko <denys@ti.com>
>
>
> > ---
> > meta-oe/recipes-core/llvm/llvm.inc | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc
> > index 31b2db4..02d4617 100644
> > --- a/meta-oe/recipes-core/llvm/llvm.inc
> > +++ b/meta-oe/recipes-core/llvm/llvm.inc
> > @@ -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}" \
> > --
> > 1.9.1
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-20 19:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-11 21:32 [meta-oe][PATCH] llvm: correct fix for the multilib libdir Jacob Stiffler
2016-04-12 5:09 ` Denys Dmytriyenko
2016-04-20 18:23 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.