Merge branch 'master' into core-updates
[jackhill/guix/guix.git] / gnu / packages / patches / cdparanoia-fpic.patch
1 diff -r -u cdparanoia-III-10.2.old/interface/Makefile.in cdparanoia-III-10.2.new/interface/Makefile.in
2 --- cdparanoia-III-10.2.old/interface/Makefile.in 2008-08-21 18:08:54.000000000 +0200
3 +++ cdparanoia-III-10.2.new/interface/Makefile.in 2013-08-07 18:48:32.000000000 +0200
4 @@ -7,7 +7,7 @@
5 srcdir=@srcdir@
6
7 @SET_MAKE@
8 -FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
9 +FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ -fPIC
10 OPT=@OPT@ $(FLAGS)
11 DEBUG=@DEBUG@ -DCDDA_TEST
12 CC=@CC@
13 @@ -33,7 +33,7 @@
14
15 slib:
16 $(MAKE) lessmessy
17 - $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic"
18 + $(MAKE) libcdda_interface.so CFLAGS="$(OPT)"
19 [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
20
21 test:
22 @@ -46,7 +46,7 @@
23 $(RANLIB) libcdda_interface.a
24
25 libcdda_interface.so: $(OFILES)
26 - $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
27 + $(CC) -fPIC -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
28 [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
29 [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
30
31 diff -r -u cdparanoia-III-10.2.old/paranoia/Makefile.in cdparanoia-III-10.2.new/paranoia/Makefile.in
32 --- cdparanoia-III-10.2.old/paranoia/Makefile.in 2008-09-04 21:02:47.000000000 +0200
33 +++ cdparanoia-III-10.2.new/paranoia/Makefile.in 2013-08-07 18:49:54.000000000 +0200
34 @@ -9,7 +9,7 @@
35
36 @SET_MAKE@
37 FLAGS=@TYPESIZES@ @CFLAGS@
38 -OPT=@OPT@ $(FLAGS)
39 +OPT=@OPT@ $(FLAGS) -fPIC
40 DEBUG=@DEBUG@
41 CC=@CC@
42 LD=@CC@
43 @@ -34,7 +34,7 @@
44
45 slib:
46 $(MAKE) lessmessy
47 - $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
48 + $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)"
49
50 #test: $(TFILES)
51 #
52 @@ -44,7 +44,7 @@
53 $(RANLIB) libcdda_paranoia.a
54
55 libcdda_paranoia.so: $(OFILES)
56 - $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
57 + $(CC) -fPIC -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
58 [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
59 [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
60