1 |
drac 07/10/20 17:58:21 |
2 |
|
3 |
Modified: cdparanoia-3.10_pre0-Makefile.in.patch |
4 |
Log: |
5 |
..to be continued. |
6 |
(Portage version: 2.1.3.15) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 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.2&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.2&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.1&r2=1.2 |
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.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- cdparanoia-3.10_pre0-Makefile.in.patch 20 Oct 2007 17:36:52 -0000 1.1 |
22 |
+++ cdparanoia-3.10_pre0-Makefile.in.patch 20 Oct 2007 17:58:20 -0000 1.2 |
23 |
@@ -1,29 +1,51 @@ |
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:33:09.000000000 +0300 |
27 |
-@@ -32,8 +32,7 @@ |
28 |
++++ cdparanoia-III-10pre0/interface/Makefile.in 2007-10-20 20:53:40.000000000 +0300 |
29 |
+@@ -10,6 +10,7 @@ |
30 |
+ FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ |
31 |
+ OPT=@OPT@ $(FLAGS) |
32 |
+ DEBUG=@DEBUG@ -DCDDA_TEST |
33 |
++LIBFLAGS = -fPIC |
34 |
+ CC=@CC@ |
35 |
+ LD=@CC@ |
36 |
+ LDFLAGS=@LDFLAGS@ $(FLAGS) |
37 |
+@@ -32,8 +33,7 @@ |
38 |
$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" |
39 |
|
40 |
slib: |
41 |
- $(MAKE) lessmessy |
42 |
- $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" |
43 |
-+ $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fPIC" |
44 |
++ $(MAKE) libcdda_interface.so CFLAGS="$(OPT)" |
45 |
[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0 |
46 |
|
47 |
test: |
48 |
-@@ -46,7 +45,7 @@ |
49 |
+@@ -46,12 +46,12 @@ |
50 |
$(RANLIB) libcdda_interface.a |
51 |
|
52 |
libcdda_interface.so: $(OFILES) |
53 |
- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) |
54 |
-+ $(CC) $(OFILES) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LDFLAGS) $(LIBS) |
55 |
++ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) |
56 |
[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 |
57 |
[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so |
58 |
|
59 |
+ .c.o: |
60 |
+- $(CC) $(CFLAGS) -c $< |
61 |
++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< |
62 |
+ |
63 |
+ lessmessy: |
64 |
+ -rm -f *.o core *~ *.out |
65 |
diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/paranoia/Makefile.in |
66 |
--- cdparanoia-III-10pre0.orig/paranoia/Makefile.in 2006-08-29 22:06:04.000000000 +0300 |
67 |
-+++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:33:31.000000000 +0300 |
68 |
-@@ -21,7 +21,7 @@ |
69 |
++++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:57:07.000000000 +0300 |
70 |
+@@ -11,6 +11,7 @@ |
71 |
+ FLAGS=@TYPESIZES@ @CFLAGS@ |
72 |
+ OPT=@OPT@ $(FLAGS) |
73 |
+ DEBUG=@DEBUG@ |
74 |
++LIBFLAGS = -fPIC |
75 |
+ CC=@CC@ |
76 |
+ LD=@CC@ |
77 |
+ LDFLAGS=@LDFLAGS@ $(FLAGS) |
78 |
+@@ -21,7 +22,7 @@ |
79 |
OFILES = paranoia.o p_block.o overlap.o gap.o isort.o |
80 |
#TFILES = isort.t gap.t p_block.t paranoia.t |
81 |
|
82 |
@@ -32,22 +54,28 @@ |
83 |
export VERSION |
84 |
|
85 |
all: lib slib |
86 |
-@@ -33,8 +33,7 @@ |
87 |
+@@ -33,8 +34,7 @@ |
88 |
$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" |
89 |
|
90 |
slib: |
91 |
- $(MAKE) lessmessy |
92 |
- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" |
93 |
-+ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fPIC" |
94 |
++ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" |
95 |
|
96 |
#test: $(TFILES) |
97 |
# |
98 |
-@@ -44,7 +43,7 @@ |
99 |
+@@ -44,12 +44,12 @@ |
100 |
$(RANLIB) libcdda_paranoia.a |
101 |
|
102 |
libcdda_paranoia.so: $(OFILES) |
103 |
- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface |
104 |
-+ $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) -L ../interface -lcdda_interface -fPIC $(LIBS) |
105 |
++ $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) -L ../interface -lcdda_interface |
106 |
[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 |
107 |
[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so |
108 |
|
109 |
+ .c.o: |
110 |
+- $(CC) $(CFLAGS) -c $< |
111 |
++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< |
112 |
+ |
113 |
+ .c.t: |
114 |
+ $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS) |
115 |
|
116 |
|
117 |
|
118 |
-- |
119 |
gentoo-commits@g.o mailing list |