diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-04 19:38:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-04 19:38:15 +0000 |
| commit | a25b03964e80c9a80b67fc24577f1c2a529c30c2 (patch) | |
| tree | c7af64919fba6a0116b3d2a9bb4b54c5bd71306f /sys-libs | |
| parent | Switch from QA_PRESTRIPPED to QA_PREBUILT since these files are in fact pre-b... (diff) | |
| download | gentoo-2-a25b03964e80c9a80b67fc24577f1c2a529c30c2.tar.gz gentoo-2-a25b03964e80c9a80b67fc24577f1c2a529c30c2.tar.bz2 gentoo-2-a25b03964e80c9a80b67fc24577f1c2a529c30c2.zip | |
Revert broken linking behavior from upstream #429756 by Lars Wendler.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/e2fsprogs-libs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild | 5 | ||||
| -rw-r--r-- | sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.5-ldflags.patch | 48 |
3 files changed, 56 insertions, 3 deletions
diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog index 4eae69b32a5d..5121a36ec11f 100644 --- a/sys-libs/e2fsprogs-libs/ChangeLog +++ b/sys-libs/e2fsprogs-libs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/e2fsprogs-libs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.90 2012/08/03 16:05:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.91 2012/08/04 19:38:15 vapier Exp $ + + 04 Aug 2012; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-libs-1.42.5-ldflags.patch, e2fsprogs-libs-1.42.5.ebuild: + Revert broken linking behavior from upstream #429756 by Lars Wendler. *e2fsprogs-libs-1.42.5 (03 Aug 2012) diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild index 1412b79bd346..aa5a6b62cdc3 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild,v 1.1 2012/08/03 16:05:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild,v 1.2 2012/08/04 19:38:15 vapier Exp $ EAPI="2" @@ -9,7 +9,7 @@ case ${PV} in *) UP_PV=${PV} ;; esac -inherit toolchain-funcs +inherit toolchain-funcs eutils DESCRIPTION="e2fsprogs libraries (common error and subsystem)" HOMEPAGE="http://e2fsprogs.sourceforge.net/" @@ -29,6 +29,7 @@ DEPEND="nls? ( sys-devel/gettext ) S=${WORKDIR}/${P%_pre*} src_prepare() { + epatch "${FILESDIR}"/${PN}-1.42.5-ldflags.patch #429756 printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613 } diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.5-ldflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.5-ldflags.patch new file mode 100644 index 000000000000..d84d54a2e88b --- /dev/null +++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.5-ldflags.patch @@ -0,0 +1,48 @@ +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 <vapier@gentoo.org> +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 + |