From 68acd04b9c51fca93595f03196e3d49fe6c44dca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 6 Jan 2007 20:39:12 +0000 Subject: [PATCH] Add patch by Prakash Punnoor in bug #160547 to fix --as-needed linking. Cleanup old versions. Package-Manager: portage-2.1.2_rc4-r6 --- media-sound/cdparanoia/ChangeLog | 11 ++++++++-- .../cdparanoia/cdparanoia-3.9.8-r5.ebuild | 9 +++++++-- .../files/cdparanoia-3.9.8-asneeded.patch | 20 +++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog index 7c63f6349583..8a190ea63f21 100644 --- a/media-sound/cdparanoia/ChangeLog +++ b/media-sound/cdparanoia/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/cdparanoia -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.53 2006/12/01 20:47:07 gustavoz Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.54 2007/01/06 20:39:12 flameeyes Exp $ + + 06 Jan 2007; Diego Pettenò + +files/cdparanoia-3.9.8-asneeded.patch, -cdparanoia-3.9.8-r1.ebuild, + -cdparanoia-3.9.8-r2.ebuild, -cdparanoia-3.9.8-r4.ebuild, + cdparanoia-3.9.8-r5.ebuild: + Add patch by Prakash Punnoor in bug #160547 to fix --as-needed linking. + Cleanup old versions. 01 Dec 2006; Gustavo Zacarias cdparanoia-3.9.8-r5.ebuild: diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild index 144a9048e4f5..c0caaa5447f6 100644 --- a/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild +++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild,v 1.7 2006/12/03 06:30:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r5.ebuild,v 1.8 2007/01/06 20:39:12 flameeyes Exp $ WANT_AUTOMAKE="latest" WANT_AUTOCONF="2.1" @@ -42,11 +42,15 @@ src_unpack() { epatch "${FILESDIR}/${P}-parallel-fpic-fbsd.patch" # Use directly the same exact patch as flex as it works + # this waits for autoepatch to be removed epatch "${FILESDIR}/flex-configure-LANG.patch" # Let portage handle the stripping of binaries sed -i -e "/strip cdparanoia/d" Makefile.in + # Fix --as-needed linking, bug #160547 + epatch "${FILESDIR}/${P}-asneeded.patch" + # Fix Makefiles for parallel building. Bug #136128. sed -i \ -e "s/^lib: $/lib: \$(OFILES)/" \ @@ -54,6 +58,7 @@ src_unpack() { -e "/\$(MAKE) lessmessy$/d" \ interface/Makefile.in paranoia/Makefile.in + # You don't want to know. mv configure.guess config.guess mv configure.sub config.sub sed -i -e '/configure.\(guess\|sub\)/d' "${S}"/configure.in diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch new file mode 100644 index 000000000000..c24c15168216 --- /dev/null +++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-asneeded.patch @@ -0,0 +1,20 @@ +--- cdparanoia-III-alpha9.8/paranoia/Makefile.in.old 2007-01-06 19:54:23.632598436 +0100 ++++ cdparanoia-III-alpha9.8/paranoia/Makefile.in 2007-01-06 19:55:15.038341210 +0100 +@@ -22,7 +22,7 @@ + OFILES = paranoia.o p_block.o overlap.o gap.o isort.o + #TFILES = isort.t gap.t p_block.t paranoia.t + +-LIBS = ../interface/libcdda_interface.a -lm ++LIBS = ../interface/libcdda_interface.so -lm + export VERSION + + all: lib slib +@@ -44,7 +44,7 @@ + $(RANLIB) libcdda_paranoia.a + + libcdda_paranoia.so: $(OFILES) +- $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) ++ $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) $(LIBS) + [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 + [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + -- 2.26.2