compile objects twice, once pic for shared libs, once nonpic for static one

Package-Manager: portage-2.1.3.15

3 files changed, 68 insertions, 30 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index da3b22de573b..c42ccbe152fa 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.57 2007/10/20 17:36:51 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.58 2007/10/21 15:08:20 aballier Exp $
+
+  21 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  files/cdparanoia-3.10_pre0-Makefile.in.patch:
+  compile objects twice, once pic for shared libs, once nonpic for static one
 
 *cdparanoia-3.10_pre0 (20 Oct 2007)
 
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index d5113b8cd308..758717e0cc58 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.9.8-gcc34.patch 772 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 SHA1 8bb7aafc54a70b558b97c88ac4a54f7535039851 SHA256 ffe735303a300d358ba99fc85f6d28c4bc7bc7ce90bf42b9838803fcc99cf150
 MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772
 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 files/3.9.8-gcc34.patch 772
 SHA256 ffe735303a300d358ba99fc85f6d28c4bc7bc7ce90bf42b9838803fcc99cf150 files/3.9.8-gcc34.patch 772
-AUX cdparanoia-3.10_pre0-Makefile.in.patch 2953 RMD160 c9a869fce12029a7d370e291ee22f68a302c05db SHA1 9bce808fd217766a8ae530c9e01c993072e1732b SHA256 6f0a4e0d6dd3e221d262661ae8bc5070e67f4d243eb28019bf819d8027ffbe00
-MD5 338bcdb0fe1a472fd5f6af68cd35c5c5 files/cdparanoia-3.10_pre0-Makefile.in.patch 2953
-RMD160 c9a869fce12029a7d370e291ee22f68a302c05db files/cdparanoia-3.10_pre0-Makefile.in.patch 2953
-SHA256 6f0a4e0d6dd3e221d262661ae8bc5070e67f4d243eb28019bf819d8027ffbe00 files/cdparanoia-3.10_pre0-Makefile.in.patch 2953
+AUX cdparanoia-3.10_pre0-Makefile.in.patch 3584 RMD160 10ac6ad1a8527fc5da86884cecbd7b7cd92c4900 SHA1 fc42f969bb256693608e4fe3722aedeb5073dc5a SHA256 7dd769f0aca16d6b7d83a07e3d76b64f2294b6ed0a6aeaa84fd0b7348369ffcb
+MD5 c6dced0aea3daed2711ed5ba427a9e8e files/cdparanoia-3.10_pre0-Makefile.in.patch 3584
+RMD160 10ac6ad1a8527fc5da86884cecbd7b7cd92c4900 files/cdparanoia-3.10_pre0-Makefile.in.patch 3584
+SHA256 7dd769f0aca16d6b7d83a07e3d76b64f2294b6ed0a6aeaa84fd0b7348369ffcb files/cdparanoia-3.10_pre0-Makefile.in.patch 3584
 AUX cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556 RMD160 42832206bf52a3629559d8090f57b3e74d64a421 SHA1 677c0c96de896277a2cf2ce811889e67c195af12 SHA256 c3dabd747091f2d3f2335f523b44a1ef5ab4b9c908fbd76b9d9feb5f40dd95f8
 MD5 69ecfbab5fbeb81f710db7528e194ebf files/cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556
 RMD160 42832206bf52a3629559d8090f57b3e74d64a421 files/cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556
@@ -70,10 +73,10 @@ EBUILD cdparanoia-3.9.8-r5.ebuild 2441 RMD160 fab2a0ac3611aa927365845b44649e2083
 MD5 b5cdc7fdaa0861707300d281188d98ec cdparanoia-3.9.8-r5.ebuild 2441
 RMD160 fab2a0ac3611aa927365845b44649e208358d456 cdparanoia-3.9.8-r5.ebuild 2441
 SHA256 423c423ff813bfab20f549a30c1f7bba9643ab12a70a86f89b19d4baabf7db36 cdparanoia-3.9.8-r5.ebuild 2441
-MISC ChangeLog 8842 RMD160 e0da6867be3333c217409b459ea504a35042d332 SHA1 4827cd2b83585f10baec615ffedb43c2d22247b3 SHA256 6d13eb6751972166984c685cd6a3f3d82be01d4fe27b06cf5e58f3de5f810204
-MD5 20e2c67f670eb18fb727de0e77f52dd1 ChangeLog 8842
-RMD160 e0da6867be3333c217409b459ea504a35042d332 ChangeLog 8842
-SHA256 6d13eb6751972166984c685cd6a3f3d82be01d4fe27b06cf5e58f3de5f810204 ChangeLog 8842
+MISC ChangeLog 9025 RMD160 b2a3a0278cbc37b0a102abe6afbefcf8e6ac46ee SHA1 6f1d82527a20e75cff7c0593a6ac0775b047ee68 SHA256 656b52df4257219748cebca86783492d8edaf5fd22adf1d6d4163955fe7e1804
+MD5 a85f60a95aa7c2aebcda1e004e979fea ChangeLog 9025
+RMD160 b2a3a0278cbc37b0a102abe6afbefcf8e6ac46ee ChangeLog 9025
+SHA256 656b52df4257219748cebca86783492d8edaf5fd22adf1d6d4163955fe7e1804 ChangeLog 9025
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -87,3 +90,10 @@ SHA256 774c16fe16f991623a0941ce4cba1169471103a20588644da693aaacfbd5e941 files/di
 MD5 19602787f2923ce3f7f374ba22e686d0 files/digest-cdparanoia-3.9.8-r5 548
 RMD160 491601913ac0118f561bcb45bc8ede53f6645f9e files/digest-cdparanoia-3.9.8-r5 548
 SHA256 8e489eed670d3494db158053dafec572f7f2acb344c74578b2acded7a66af01e files/digest-cdparanoia-3.9.8-r5 548
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHG2t+vFcC4BYPU0oRAjmuAJ4w8txKANZNbI9AWSjNPA5wI05sPwCeOu6B
+uJ8wGzBhyVgX5xZesLzDER4=
+=xpwu
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
index cbc696ea29e3..0b81bede7057 100644
--- a/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
+++ b/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
@@ -1,7 +1,8 @@
-diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/interface/Makefile.in
---- cdparanoia-III-10pre0.orig/interface/Makefile.in	2006-08-30 01:14:08.000000000 +0300
-+++ cdparanoia-III-10pre0/interface/Makefile.in	2007-10-20 20:53:40.000000000 +0300
-@@ -10,6 +10,7 @@
+Index: cdparanoia-III-10pre0/interface/Makefile.in
+===================================================================
+--- cdparanoia-III-10pre0.orig/interface/Makefile.in
++++ cdparanoia-III-10pre0/interface/Makefile.in
+@@ -10,6 +10,7 @@ srcdir=@srcdir@
  FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ -DCDDA_TEST
@@ -9,7 +10,16 @@ diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/
  CC=@CC@
  LD=@CC@
  LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -32,8 +33,7 @@
+@@ -20,6 +21,8 @@ CPPFLAGS+=-D_REENTRANT
+ 
+ OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
+ 	scsi_interface.o smallft.o toc.o test_interface.o
++LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\
++	scsi_interface.lo smallft.lo toc.lo test_interface.lo
+ 
+ export VERSION
+ 
+@@ -32,8 +35,7 @@ lib:	
  	$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" 
  
  slib:	
@@ -19,25 +29,31 @@ diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/
  	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
  
  test:	
-@@ -46,12 +46,12 @@
+@@ -45,14 +47,17 @@ libcdda_interface.a: 	$(OFILES)	
+ 	$(AR) -r libcdda_interface.a $(OFILES)
  	$(RANLIB) libcdda_interface.a
  
- libcdda_interface.so: 	$(OFILES)	
+-libcdda_interface.so: 	$(OFILES)	
 -	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
-+	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++libcdda_interface.so: 	$(LOFILES)	
++	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(LIBS)
  	[ -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 $<
+ 	$(CC) $(CFLAGS) -c $<
  
++%.lo: %.c
++	$(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
++
  lessmessy:
  	-rm  -f *.o core *~ *.out
-diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/paranoia/Makefile.in
---- cdparanoia-III-10pre0.orig/paranoia/Makefile.in	2006-08-29 22:06:04.000000000 +0300
-+++ cdparanoia-III-10pre0/paranoia/Makefile.in	2007-10-20 20:57:07.000000000 +0300
-@@ -11,6 +11,7 @@
+ 
+Index: cdparanoia-III-10pre0/paranoia/Makefile.in
+===================================================================
+--- cdparanoia-III-10pre0.orig/paranoia/Makefile.in
++++ cdparanoia-III-10pre0/paranoia/Makefile.in
+@@ -11,6 +11,7 @@ srcdir=@srcdir@
  FLAGS=@TYPESIZES@ @CFLAGS@
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ 
@@ -45,8 +61,11 @@ diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/p
  CC=@CC@
  LD=@CC@
  LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -21,7 +22,7 @@
+@@ -19,9 +20,10 @@ RANLIB=@RANLIB@
+ CPPFLAGS+=-D_REENTRANT
+ 
  OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
++LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo
  #TFILES = isort.t gap.t p_block.t paranoia.t
  
 -LIBS = ../interface/libcdda_interface.a -lm
@@ -54,7 +73,7 @@ diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/p
  export VERSION
  
  all: lib slib
-@@ -33,8 +34,7 @@
+@@ -33,8 +35,7 @@ lib:	
  	$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" 
  
  slib:	
@@ -64,18 +83,23 @@ diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/p
  
  #test:	$(TFILES)
  #
-@@ -44,12 +44,12 @@
+@@ -43,14 +44,17 @@ libcdda_paranoia.a: 	$(OFILES)	
+ 	$(AR) -r libcdda_paranoia.a $(OFILES)
  	$(RANLIB) libcdda_paranoia.a
  
- libcdda_paranoia.so: 	$(OFILES)	
+-libcdda_paranoia.so: 	$(OFILES)	
 -	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
-+	$(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) -L ../interface -lcdda_interface
++libcdda_paranoia.so: 	$(LOFILES)	
++	$(CC) $(LOFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) -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 $<
+ 	$(CC) $(CFLAGS) -c $<
  
++%.lo: %.c
++	$(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
++
  .c.t:
  	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
+ 	$@