* [Buildroot] [PATCH 1/1] toolchain-external: dynamic loader symlink to actual location of musl libc.so
@ 2017-05-18 13:03 Ilya Kuzmich
2017-05-25 12:09 ` Ilya Kuzmich
2017-07-02 13:46 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Ilya Kuzmich @ 2017-05-18 13:03 UTC (permalink / raw)
To: buildroot
Test whenever musl libc.so located at /lib or /usr/lib and create dynamic
library loader symlink accordingly.
Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
---
toolchain/toolchain-external/pkg-toolchain-external.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
index 9670350..438d714 100644
--- a/toolchain/toolchain-external/pkg-toolchain-external.mk
+++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
@@ -489,7 +489,12 @@ else
MUSL_ARCH = $(ARCH)
endif
define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
- ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1
+ if test -e $(STAGING_DIR)/usr/lib/libc.so; then \
+ LD_LINK_TARGET=../usr/lib/libc.so ;\
+ else \
+ LD_LINK_TARGET=libc.so ;\
+ fi ;\
+ ln -sf "$${LD_LINK_TARGET}" $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 ;
endef
endif
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 1/1] toolchain-external: dynamic loader symlink to actual location of musl libc.so
2017-05-18 13:03 [Buildroot] [PATCH 1/1] toolchain-external: dynamic loader symlink to actual location of musl libc.so Ilya Kuzmich
@ 2017-05-25 12:09 ` Ilya Kuzmich
2017-07-02 13:46 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Ilya Kuzmich @ 2017-05-25 12:09 UTC (permalink / raw)
To: buildroot
ping?
On 18/05, Ilya Kuzmich wrote:
> Test whenever musl libc.so located at /lib or /usr/lib and create dynamic
> library loader symlink accordingly.
>
> Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
> ---
> toolchain/toolchain-external/pkg-toolchain-external.mk | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
> index 9670350..438d714 100644
> --- a/toolchain/toolchain-external/pkg-toolchain-external.mk
> +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
> @@ -489,7 +489,12 @@ else
> MUSL_ARCH = $(ARCH)
> endif
> define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
> - ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1
> + if test -e $(STAGING_DIR)/usr/lib/libc.so; then \
> + LD_LINK_TARGET=../usr/lib/libc.so ;\
> + else \
> + LD_LINK_TARGET=libc.so ;\
> + fi ;\
> + ln -sf "$${LD_LINK_TARGET}" $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 ;
> endef
> endif
>
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 1/1] toolchain-external: dynamic loader symlink to actual location of musl libc.so
2017-05-18 13:03 [Buildroot] [PATCH 1/1] toolchain-external: dynamic loader symlink to actual location of musl libc.so Ilya Kuzmich
2017-05-25 12:09 ` Ilya Kuzmich
@ 2017-07-02 13:46 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2017-07-02 13:46 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 18 May 2017 16:03:16 +0300, Ilya Kuzmich wrote:
> Test whenever musl libc.so located at /lib or /usr/lib and create dynamic
> library loader symlink accordingly.
>
> Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
Thanks. However, after discussing this issue, we found that we could in
fact entirely get rid of this TOOLCHAIN_EXTERNAL_MUSL_LD_LINK hook. See
https://patchwork.ozlabs.org/patch/783188/.
So I've marked your patch as "Superseded". Of course, my new proposal
has been tested with a Crosstool-NG musl toolchain.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-02 13:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-18 13:03 [Buildroot] [PATCH 1/1] toolchain-external: dynamic loader symlink to actual location of musl libc.so Ilya Kuzmich
2017-05-25 12:09 ` Ilya Kuzmich
2017-07-02 13:46 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox