Added a patch to fix the makefiles properly for parallel make (re-fixes bug #136128).

(Portage version: 2.1)

3 files changed, 90 insertions, 3 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 5c7106bbde79..a2a160f2329a 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2006/06/12 19:25:09 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.42 2006/06/12 20:47:22 chutzpah Exp $
+
+  12 Jun 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/cdparanoia-3.9.8-parallel-fpic.patch, cdparanoia-3.9.8-r4.ebuild:
+  Added a patch to fix the makefiles properly for parallel make (re-fixes bug
+  #136128).
 
   12 Jun 2006; Patrick McLean <chutzpah@gentoo.org>
   cdparanoia-3.9.8-r4.ebuild:
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild
index 0aae58a4015f..2b65690b4d14 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r4.ebuild,v 1.2 2006/06/12 19:25:09 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r4.ebuild,v 1.3 2006/06/12 20:47:22 chutzpah Exp $
 
 inherit eutils flag-o-matic gnuconfig linux-info libtool toolchain-funcs
 
@@ -49,6 +49,9 @@ src_unpack() {
 	# Use directly the same exact patch as flex as it works
 	epatch "${FILESDIR}/flex-configure-LANG.patch"
 
+	# Fix makefiles for parallel make
+	epatch "${FILESDIR}/${P}-parallel-fpic.patch"
+
 	# Let portage handle the stripping of binaries
 	sed -i -e "/strip cdparanoia/d" Makefile.in
 
@@ -64,7 +67,7 @@ src_compile() {
 	tc-export CC AR RANLIB
 	append-flags -I${S}/interface
 	econf || die
-	emake -j1 OPT="${CFLAGS}" || die
+	emake OPT="${CFLAGS}" || die
 }
 
 src_install() {
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic.patch
new file mode 100644
index 000000000000..ef5c40ea7338
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-parallel-fpic.patch
@@ -0,0 +1,79 @@
+diff -ur cdparanoia-III-alpha9.8.orig/interface/Makefile.in cdparanoia-III-alpha9.8/interface/Makefile.in
+--- cdparanoia-III-alpha9.8.orig/interface/Makefile.in	2006-06-12 16:31:46.000000000 -0400
++++ cdparanoia-III-alpha9.8/interface/Makefile.in	2006-06-12 16:32:55.000000000 -0400
+@@ -10,6 +10,7 @@
+ FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
+ OPT=@OPT@ $(FLAGS)
+ DEBUG=@DEBUG@ $(FLAGS) -DCDDA_TEST
++LIBFLAGS=-fPIC
+ CC=@CC@
+ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+@@ -18,7 +19,7 @@
+ LIBS = -lm
+ CPPFLAGS+=-D_REENTRANT
+ 
+-OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
++OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o \
+ 	scsi_interface.o smallft.o toc.o test_interface.o
+ 
+ export VERSION
+@@ -33,7 +34,7 @@
+ 
+ slib:	
+ 	$(MAKE) lessmessy
+-	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_interface.so CFLAGS="$(OPT)" 
+ 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
+ 
+ test:	
+@@ -46,12 +47,12 @@
+ 	$(RANLIB) libcdda_interface.a
+ 
+ libcdda_interface.so: 	$(OFILES)	
+-	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm
++	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm
+ 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
+ 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(LIBFLAGS) -c $<
+ 
+ lessmessy:
+ 	-rm  -f *.o core *~ *.out
+diff -ur cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in cdparanoia-III-alpha9.8/paranoia/Makefile.in
+--- cdparanoia-III-alpha9.8.orig/paranoia/Makefile.in	2006-06-12 16:31:46.000000000 -0400
++++ cdparanoia-III-alpha9.8/paranoia/Makefile.in	2006-06-12 16:33:36.000000000 -0400
+@@ -11,6 +11,7 @@
+ FLAGS=@TYPESIZES@ @CFLAGS@
+ OPT=@OPT@ $(FLAGS)
+ DEBUG=@DEBUG@ $(FLAGS)
++LIBFLAGS=-fPIC
+ CC=@CC@
+ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+@@ -34,7 +35,7 @@
+ 
+ slib:	
+ 	$(MAKE) lessmessy
+-	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" 
+ 
+ #test:	$(TFILES)
+ #
+@@ -44,12 +45,12 @@
+ 	$(RANLIB) libcdda_paranoia.a
+ 
+ libcdda_paranoia.so: 	$(OFILES)	
+-	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
++	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
+ 	[ -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
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(LIBFLAGS) -c $<
+ 
+ .c.t:
+ 	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)