Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/cdparanoia/files: cdparanoia-3.10_pre0-Makefile.in.patch cdparanoia-3.10_pre0-asneeded.patch
Date: Sat, 20 Oct 2007 17:47:36
Message-Id: E1IjIFo-0001B0-Kb@stork.gentoo.org
1 drac 07/10/20 17:36:52
2
3 Added: cdparanoia-3.10_pre0-Makefile.in.patch
4 Removed: cdparanoia-3.10_pre0-asneeded.patch
5 Log:
6 To be continued..
7 (Portage version: 2.1.3.15)
8
9 Revision Changes Path
10 1.1 media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch?rev=1.1&content-type=text/plain
14
15 Index: cdparanoia-3.10_pre0-Makefile.in.patch
16 ===================================================================
17 diff -ur cdparanoia-III-10pre0.orig/interface/Makefile.in cdparanoia-III-10pre0/interface/Makefile.in
18 --- cdparanoia-III-10pre0.orig/interface/Makefile.in 2006-08-30 01:14:08.000000000 +0300
19 +++ cdparanoia-III-10pre0/interface/Makefile.in 2007-10-20 20:33:09.000000000 +0300
20 @@ -32,8 +32,7 @@
21 $(MAKE) libcdda_interface.a CFLAGS="$(OPT)"
22
23 slib:
24 - $(MAKE) lessmessy
25 - $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic"
26 + $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fPIC"
27 [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
28
29 test:
30 @@ -46,7 +45,7 @@
31 $(RANLIB) libcdda_interface.a
32
33 libcdda_interface.so: $(OFILES)
34 - $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
35 + $(CC) $(OFILES) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LDFLAGS) $(LIBS)
36 [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
37 [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
38
39 diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/paranoia/Makefile.in
40 --- cdparanoia-III-10pre0.orig/paranoia/Makefile.in 2006-08-29 22:06:04.000000000 +0300
41 +++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:33:31.000000000 +0300
42 @@ -21,7 +21,7 @@
43 OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
44 #TFILES = isort.t gap.t p_block.t paranoia.t
45
46 -LIBS = ../interface/libcdda_interface.a -lm
47 +LIBS = ../interface/libcdda_interface.so -lm
48 export VERSION
49
50 all: lib slib
51 @@ -33,8 +33,7 @@
52 $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
53
54 slib:
55 - $(MAKE) lessmessy
56 - $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
57 + $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fPIC"
58
59 #test: $(TFILES)
60 #
61 @@ -44,7 +43,7 @@
62 $(RANLIB) libcdda_paranoia.a
63
64 libcdda_paranoia.so: $(OFILES)
65 - $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
66 + $(CC) $(OFILES) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) -L ../interface -lcdda_interface -fPIC $(LIBS)
67 [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
68 [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
69
70
71
72
73 --
74 gentoo-commits@g.o mailing list