Author: matteo
Date: 2015-06-25 12:14:22 +0200 (Thu, 25 Jun 2015)
New Revision: 46123
Added:
trunk/toolchain/musl/patches/300-relative.patch
Modified:
trunk/package/Makefile
Log:
fix mklibs with musl
crate a relative symlink to libc.so because
make wildcard function ignores broken symlinks
Modified: trunk/package/Makefile
===================================================================
--- trunk/package/Makefile 2015-06-24 18:52:13 UTC (rev 46122)
+++ trunk/package/Makefile 2015-06-25 10:14:22 UTC (rev 46123)
@@ -41,7 +41,7 @@
--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) \
Added: trunk/toolchain/musl/patches/300-relative.patch
===================================================================
--- trunk/toolchain/musl/patches/300-relative.patch
(rev 0)
+++ trunk/toolchain/musl/patches/300-relative.patch 2015-06-25 10:14:22 UTC
(rev 46123)
@@ -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),)
+
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
