/[gentoo-x86]/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch
Gentoo

Contents of /sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Aug 4 19:39:31 2012 UTC (2 years, 2 months ago) by vapier
Branch: MAIN
Revert broken linking behavior from upstream #429756 by Lars Wendler.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

1 https://bugs.gentoo.org/429756
2 https://sourceforge.net/tracker/?func=detail&aid=3542572&group_id=2406&atid=102406
3
4 From 949c2c19e969185c69f0960549a559ed22afdd24 Mon Sep 17 00:00:00 2001
5 From: Mike Frysinger <vapier@gentoo.org>
6 Date: Sat, 4 Aug 2012 15:12:29 -0400
7 Subject: [PATCH] Revert "Link shared libraries with local libraries instead
8 of system ones"
9
10 This reverts commit a7c17431b9fbf767235d614cfe2e4f22ee0d6771.
11 ---
12 lib/Makefile.elf-lib | 4 ++--
13 lib/Makefile.solaris-lib | 4 ++--
14 2 files changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
17 index c66281c..c24636c 100644
18 --- a/lib/Makefile.elf-lib
19 +++ b/lib/Makefile.elf-lib
20 @@ -24,8 +24,8 @@ image: $(ELF_LIB)
21
22 $(ELF_LIB): $(OBJS)
23 $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
24 - $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
25 - $(LDFLAGS) -Wl,-soname,$(ELF_SONAME) $(OBJS))
26 + $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
27 + -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
28 $(Q) $(MV) elfshared/$(ELF_LIB) .
29 $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
30 $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
31 diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
32 index 66f2b4c..92bdbe2 100644
33 --- a/lib/Makefile.solaris-lib
34 +++ b/lib/Makefile.solaris-lib
35 @@ -24,8 +24,8 @@ image: $(ELF_LIB)
36
37 $(ELF_LIB): $(OBJS)
38 $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
39 - $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
40 - $(LDFLAGS) -Wl,-h,$(ELF_SONAME) $(OBJS))
41 + $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
42 + -Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
43 $(Q) $(MV) elfshared/$(ELF_LIB) .
44 $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
45 $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
46 --
47 1.7.9.7

  ViewVC Help
Powered by ViewVC 1.1.20