diff options
Diffstat (limited to 'sys-libs/ss/files/ss-1.37-makefile.patch')
| -rw-r--r-- | sys-libs/ss/files/ss-1.37-makefile.patch | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/sys-libs/ss/files/ss-1.37-makefile.patch b/sys-libs/ss/files/ss-1.37-makefile.patch index f6322fea403d..b60ea5a37677 100644 --- a/sys-libs/ss/files/ss-1.37-makefile.patch +++ b/sys-libs/ss/files/ss-1.37-makefile.patch @@ -1,9 +1,47 @@ Fix the symlinks that submakefiles create so that they don't suck at life. ---- e2fsprogs-1.37/lib/Makefile.elf-lib -+++ e2fsprogs-1.37/lib/Makefile.elf-lib +Don't use target LDFLAGS/CFLAGS when compiling native apps. + +--- lib/Makefile.elf-lib ++++ lib/Makefile.elf-lib @@ -49,3 +49,3 @@ @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so" - @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ + @$(LN_S) -f $(ELF_SONAME) \ $(DESTDIR)$(libdir)/$(ELF_IMAGE).so +--- util/Makefile.in ++++ util/Makefile.in +@@ -15,7 +15,7 @@ + + .c.o: + @echo " CC $<" +- @$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@ ++ @$(BUILD_CC) -c $(DEFS) $< -o $@ + + PROGS= subst + +@@ -23,11 +23,11 @@ + + subst: subst.o + @echo " LD $@" +- @$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o ++ @$(BUILD_CC) -o subst subst.o + + copy_sparse: copy_sparse.o + @echo " LD $@" +- @$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o ++ @$(BUILD_CC) -o copy_sparse copy_sparse.o + + gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status + @echo " CONFIG.STATUS $@" +--- lib/Makefile.elf-lib ++++ lib/Makefile.elf-lib +@@ -26,7 +26,7 @@ + + $(ELF_LIB): $(OBJS) + @echo " GEN_ELF_SOLIB $(ELF_LIB)" +- @(cd elfshared; $(CC) --shared -o $(ELF_LIB) \ ++ @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \ + -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) + @$(MV) elfshared/$(ELF_LIB) . + @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) |