fix mklibs with musl

crate a relative symlink to libc.so because
make wildcard function ignores broken symlinks

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46123 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/Makefile b/package/Makefile
index 5fb7363..3ef34b1 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -41,7 +41,7 @@ ifdef CONFIG_USE_MKLIBS
                --sysroot $(STAGING_DIR_ROOT) \
                `cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
                --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
-                       $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so, \
+                       $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \
                          $(STAGING_DIR_ROOT)/lib/$(name) \
                        )))) \
                --target $(REAL_GNU_TARGET_NAME) \

diff --git a/toolchain/musl/patches/300-relative.patch b/toolchain/musl/patches/300-relative.patch
new file mode 100644 (file)
index 0000000..dc7d167
--- /dev/null
+++ b/toolchain/musl/patches/300-relative.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -180,7 +180,7 @@ $(DESTDIR)$(includedir)/%: include/%
+       $(INSTALL) -D -m 644 $< $@
+ 
+ $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
+-      $(INSTALL) -D -l $(libdir)/libc.so $@ || true
++      $(INSTALL) -D -l libc.so $@ || true
+ 
+ install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+