From: Denys Dmytriyenko <denis@denix.org>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH] llvm: correct fix for the multilib libdir
Date: Tue, 12 Apr 2016 01:09:10 -0400 [thread overview]
Message-ID: <20160412050910.GW16135@denix.org> (raw)
In-Reply-To: <1460410351-25968-1-git-send-email-j-stiffler@ti.com>
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
next prev parent reply other threads:[~2016-04-12 6:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-11 21:32 [meta-oe][PATCH] llvm: correct fix for the multilib libdir Jacob Stiffler
2016-04-12 5:09 ` Denys Dmytriyenko [this message]
2016-04-20 18:23 ` Denys Dmytriyenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160412050910.GW16135@denix.org \
--to=denis@denix.org \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox