diff options
| author | Matteo Croce <matteo@openwrt.org> | 2015-06-25 10:14:22 +0000 |
|---|---|---|
| committer | Matteo Croce <matteo@openwrt.org> | 2015-06-25 10:14:22 +0000 |
| commit | 3fc9fc7a53431eaadbb11f4bb80766553c2b72c9 (patch) | |
| tree | 8f30b2afbdf020ab745eb8e2cac1c3b522d3f7a8 | |
| parent | 672f31577df831aede9841d58fb61464d1ca5566 (diff) | |
| download | master-187ad058-3fc9fc7a53431eaadbb11f4bb80766553c2b72c9.tar.gz master-187ad058-3fc9fc7a53431eaadbb11f4bb80766553c2b72c9.tar.bz2 master-187ad058-3fc9fc7a53431eaadbb11f4bb80766553c2b72c9.zip | |
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
| -rw-r--r-- | package/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/musl/patches/300-relative.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/package/Makefile b/package/Makefile index 5fb7363bc9..3ef34b1779 100644 --- 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 index 0000000000..dc7d167635 --- /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),) + |