https://bugs.gentoo.org/429756 https://sourceforge.net/tracker/?func=detail&aid=3542572&group_id=2406&atid=102406 From 949c2c19e969185c69f0960549a559ed22afdd24 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 4 Aug 2012 15:12:29 -0400 Subject: [PATCH] Revert "Link shared libraries with local libraries instead of system ones" This reverts commit a7c17431b9fbf767235d614cfe2e4f22ee0d6771. --- lib/Makefile.elf-lib | 4 ++-- lib/Makefile.solaris-lib | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib index c66281c..c24636c 100644 --- a/lib/Makefile.elf-lib +++ b/lib/Makefile.elf-lib @@ -24,8 +24,8 @@ image: $(ELF_LIB) $(ELF_LIB): $(OBJS) $(E) " GEN_ELF_SOLIB $(ELF_LIB)" - $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \ - $(LDFLAGS) -Wl,-soname,$(ELF_SONAME) $(OBJS)) + $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \ + -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) $(Q) $(MV) elfshared/$(ELF_LIB) . $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \ diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib index 66f2b4c..92bdbe2 100644 --- a/lib/Makefile.solaris-lib +++ b/lib/Makefile.solaris-lib @@ -24,8 +24,8 @@ image: $(ELF_LIB) $(ELF_LIB): $(OBJS) $(E) " GEN_ELF_SOLIB $(ELF_LIB)" - $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \ - $(LDFLAGS) -Wl,-h,$(ELF_SONAME) $(OBJS)) + $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \ + -Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) $(Q) $(MV) elfshared/$(ELF_LIB) . $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \ -- 1.7.9.7