Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 747346 | Differences between
and this patch

Collapse All | Expand All

(-)a/Makefile (-4 / +7 lines)
Lines 74-79 Link Here
74
WRAPCC_CLANG = clang
74
WRAPCC_CLANG = clang
75
75
76
LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1
76
LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1
77
LDSO_NAME = ld-musl-$(ARCH)$(SUBARCH).so.1
77
78
78
-include config.mak
79
-include config.mak
79
-include $(srcdir)/arch/$(ARCH)/arch.mak
80
-include $(srcdir)/arch/$(ARCH)/arch.mak
Lines 192-198 Link Here
192
	$(INSTALL) -D $< $@
193
	$(INSTALL) -D $< $@
193
194
194
$(DESTDIR)$(libdir)/%.so: lib/%.so
195
$(DESTDIR)$(libdir)/%.so: lib/%.so
195
	$(INSTALL) -D -m 755 $< $@
196
	$(INSTALL) -D -l $(LDSO_PATHNAME) $(DESTDIR)$(libdir)/libc.so
197
	$(INSTALL) -D -l $(LDSO_NAME) $(DESTDIR)$(syslibdir)/libc.so.1
198
	$(INSTALL) -D -m 755 lib/libc.so $(DESTDIR)$(LDSO_PATHNAME)
196
199
197
$(DESTDIR)$(libdir)/%: lib/%
200
$(DESTDIR)$(libdir)/%: lib/%
198
	$(INSTALL) -D -m 644 $< $@
201
	$(INSTALL) -D -m 644 $< $@
Lines 209-218 Link Here
209
$(DESTDIR)$(includedir)/%: $(srcdir)/include/%
212
$(DESTDIR)$(includedir)/%: $(srcdir)/include/%
210
	$(INSTALL) -D -m 644 $< $@
213
	$(INSTALL) -D -m 644 $< $@
211
214
212
$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
215
#$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
213
	$(INSTALL) -D -l $(libdir)/libc.so $@ || true
216
#	$(INSTALL) -D -m 755 lib/libc.so $(DESTDIR)$(libdir)/libc.so
214
217
215
install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
218
install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) #$(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
216
219
217
install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)
220
install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)
218
221

Return to bug 747346