| 1 |
aballier 07/10/21 15:08:22 |
| 2 |
|
| 3 |
Modified: cdparanoia-3.10_pre0-Makefile.in.patch |
| 4 |
Log: |
| 5 |
compile objects twice, once pic for shared libs, once nonpic for static one |
| 6 |
(Portage version: 2.1.3.15) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: cdparanoia-3.10_pre0-Makefile.in.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- cdparanoia-3.10_pre0-Makefile.in.patch 20 Oct 2007 17:58:20 -0000 1.2 |
| 22 |
+++ cdparanoia-3.10_pre0-Makefile.in.patch 21 Oct 2007 15:08:21 -0000 1.3 |
| 23 |
@@ -1,7 +1,8 @@ |
| 24 |
-diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/interface/Makefile.in |
| 25 |
---- cdparanoia-III-10pre0.orig/interface/Makefile.in 2006-08-30 01:14:08.000000000 +0300 |
| 26 |
-+++ cdparanoia-III-10pre0/interface/Makefile.in 2007-10-20 20:53:40.000000000 +0300 |
| 27 |
-@@ -10,6 +10,7 @@ |
| 28 |
+Index: cdparanoia-III-10pre0/interface/Makefile.in |
| 29 |
+=================================================================== |
| 30 |
+--- cdparanoia-III-10pre0.orig/interface/Makefile.in |
| 31 |
++++ cdparanoia-III-10pre0/interface/Makefile.in |
| 32 |
+@@ -10,6 +10,7 @@ srcdir=@srcdir@ |
| 33 |
FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ |
| 34 |
OPT=@OPT@ $(FLAGS) |
| 35 |
DEBUG=@DEBUG@ -DCDDA_TEST |
| 36 |
@@ -9,7 +10,16 @@ |
| 37 |
CC=@CC@ |
| 38 |
LD=@CC@ |
| 39 |
LDFLAGS=@LDFLAGS@ $(FLAGS) |
| 40 |
-@@ -32,8 +33,7 @@ |
| 41 |
+@@ -20,6 +21,8 @@ CPPFLAGS+=-D_REENTRANT |
| 42 |
+ |
| 43 |
+ OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\ |
| 44 |
+ scsi_interface.o smallft.o toc.o test_interface.o |
| 45 |
++LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\ |
| 46 |
++ scsi_interface.lo smallft.lo toc.lo test_interface.lo |
| 47 |
+ |
| 48 |
+ export VERSION |
| 49 |
+ |
| 50 |
+@@ -32,8 +35,7 @@ lib: |
| 51 |
$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" |
| 52 |
|
| 53 |
slib: |
| 54 |
@@ -19,25 +29,31 @@ |
| 55 |
[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0 |
| 56 |
|
| 57 |
test: |
| 58 |
-@@ -46,12 +46,12 @@ |
| 59 |
+@@ -45,14 +47,17 @@ libcdda_interface.a: $(OFILES) |
| 60 |
+ $(AR) -r libcdda_interface.a $(OFILES) |
| 61 |
$(RANLIB) libcdda_interface.a |
| 62 |
|
| 63 |
- libcdda_interface.so: $(OFILES) |
| 64 |
+-libcdda_interface.so: $(OFILES) |
| 65 |
- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) |
| 66 |
-+ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) |
| 67 |
++libcdda_interface.so: $(LOFILES) |
| 68 |
++ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(LIBS) |
| 69 |
[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 |
| 70 |
[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so |
| 71 |
|
| 72 |
.c.o: |
| 73 |
-- $(CC) $(CFLAGS) -c $< |
| 74 |
-+ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< |
| 75 |
+ $(CC) $(CFLAGS) -c $< |
| 76 |
|
| 77 |
++%.lo: %.c |
| 78 |
++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@ |
| 79 |
++ |
| 80 |
lessmessy: |
| 81 |
-rm -f *.o core *~ *.out |
| 82 |
-diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/paranoia/Makefile.in |
| 83 |
---- cdparanoia-III-10pre0.orig/paranoia/Makefile.in 2006-08-29 22:06:04.000000000 +0300 |
| 84 |
-+++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:57:07.000000000 +0300 |
| 85 |
-@@ -11,6 +11,7 @@ |
| 86 |
+ |
| 87 |
+Index: cdparanoia-III-10pre0/paranoia/Makefile.in |
| 88 |
+=================================================================== |
| 89 |
+--- cdparanoia-III-10pre0.orig/paranoia/Makefile.in |
| 90 |
++++ cdparanoia-III-10pre0/paranoia/Makefile.in |
| 91 |
+@@ -11,6 +11,7 @@ srcdir=@srcdir@ |
| 92 |
FLAGS=@TYPESIZES@ @CFLAGS@ |
| 93 |
OPT=@OPT@ $(FLAGS) |
| 94 |
DEBUG=@DEBUG@ |
| 95 |
@@ -45,8 +61,11 @@ |
| 96 |
CC=@CC@ |
| 97 |
LD=@CC@ |
| 98 |
LDFLAGS=@LDFLAGS@ $(FLAGS) |
| 99 |
-@@ -21,7 +22,7 @@ |
| 100 |
+@@ -19,9 +20,10 @@ RANLIB=@RANLIB@ |
| 101 |
+ CPPFLAGS+=-D_REENTRANT |
| 102 |
+ |
| 103 |
OFILES = paranoia.o p_block.o overlap.o gap.o isort.o |
| 104 |
++LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo |
| 105 |
#TFILES = isort.t gap.t p_block.t paranoia.t |
| 106 |
|
| 107 |
-LIBS = ../interface/libcdda_interface.a -lm |
| 108 |
@@ -54,7 +73,7 @@ |
| 109 |
export VERSION |
| 110 |
|
| 111 |
all: lib slib |
| 112 |
-@@ -33,8 +34,7 @@ |
| 113 |
+@@ -33,8 +35,7 @@ lib: |
| 114 |
$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" |
| 115 |
|
| 116 |
slib: |
| 117 |
@@ -64,18 +83,23 @@ |
| 118 |
|
| 119 |
#test: $(TFILES) |
| 120 |
# |
| 121 |
-@@ -44,12 +44,12 @@ |
| 122 |
+@@ -43,14 +44,17 @@ libcdda_paranoia.a: $(OFILES) |
| 123 |
+ $(AR) -r libcdda_paranoia.a $(OFILES) |
| 124 |
$(RANLIB) libcdda_paranoia.a |
| 125 |
|
| 126 |
- libcdda_paranoia.so: $(OFILES) |
| 127 |
+-libcdda_paranoia.so: $(OFILES) |
| 128 |
- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface |
| 129 |
-+ $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) -L ../interface -lcdda_interface |
| 130 |
++libcdda_paranoia.so: $(LOFILES) |
| 131 |
++ $(CC) $(LOFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) -L ../interface -lcdda_interface |
| 132 |
[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 |
| 133 |
[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so |
| 134 |
|
| 135 |
.c.o: |
| 136 |
-- $(CC) $(CFLAGS) -c $< |
| 137 |
-+ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< |
| 138 |
+ $(CC) $(CFLAGS) -c $< |
| 139 |
|
| 140 |
++%.lo: %.c |
| 141 |
++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@ |
| 142 |
++ |
| 143 |
.c.t: |
| 144 |
$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS) |
| 145 |
+ $@ |
| 146 |
|
| 147 |
|
| 148 |
|
| 149 |
-- |
| 150 |
gentoo-commits@g.o mailing list |
Archives