summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-10-20 17:58:20 +0000
committerSamuli Suominen <drac@gentoo.org>2007-10-20 17:58:20 +0000
commit1611cedb9f2a0a81e02423fc1f6f896bfc9f2c9a (patch)
tree1e167e76e7a13f18a6f7aa44b056220bf06013a0 /media-sound
parentCopied valgrind-3.2.3 to 3.2.3-r1 to force upgrade to a version with a fix fo... (diff)
downloadgentoo-2-1611cedb9f2a0a81e02423fc1f6f896bfc9f2c9a.tar.gz
gentoo-2-1611cedb9f2a0a81e02423fc1f6f896bfc9f2c9a.tar.bz2
gentoo-2-1611cedb9f2a0a81e02423fc1f6f896bfc9f2c9a.zip
..to be continued.
(Portage version: 2.1.3.15)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch50
1 files changed, 39 insertions, 11 deletions
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 e9bbec259982..cbc696ea29e3 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,29 +1,51 @@
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:33:09.000000000 +0300
-@@ -32,8 +32,7 @@
++++ cdparanoia-III-10pre0/interface/Makefile.in 2007-10-20 20:53:40.000000000 +0300
+@@ -10,6 +10,7 @@
+ FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
+ OPT=@OPT@ $(FLAGS)
+ DEBUG=@DEBUG@ -DCDDA_TEST
++LIBFLAGS = -fPIC
+ CC=@CC@
+ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+@@ -32,8 +33,7 @@
$(MAKE) libcdda_interface.a CFLAGS="$(OPT)"
slib:
- $(MAKE) lessmessy
- $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic"
-+ $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fPIC"
++ $(MAKE) libcdda_interface.so CFLAGS="$(OPT)"
[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
test:
-@@ -46,7 +45,7 @@
+@@ -46,12 +46,12 @@
$(RANLIB) libcdda_interface.a
libcdda_interface.so: $(OFILES)
- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
-+ $(CC) $(OFILES) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LDFLAGS) $(LIBS)
++ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(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 $<
+
+ 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:33:31.000000000 +0300
-@@ -21,7 +21,7 @@
++++ cdparanoia-III-10pre0/paranoia/Makefile.in 2007-10-20 20:57:07.000000000 +0300
+@@ -11,6 +11,7 @@
+ FLAGS=@TYPESIZES@ @CFLAGS@
+ OPT=@OPT@ $(FLAGS)
+ DEBUG=@DEBUG@
++LIBFLAGS = -fPIC
+ CC=@CC@
+ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+@@ -21,7 +22,7 @@
OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
#TFILES = isort.t gap.t p_block.t paranoia.t
@@ -32,22 +54,28 @@ diff -ur cdparanoia-III-10pre0.orig/paranoia/Makefile.in cdparanoia-III-10pre0/p
export VERSION
all: lib slib
-@@ -33,8 +33,7 @@
+@@ -33,8 +34,7 @@
$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
slib:
- $(MAKE) lessmessy
- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
-+ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fPIC"
++ $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)"
#test: $(TFILES)
#
-@@ -44,7 +43,7 @@
+@@ -44,12 +44,12 @@
$(RANLIB) libcdda_paranoia.a
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) -L ../interface -lcdda_interface -fPIC $(LIBS)
++ $(CC) $(OFILES) -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 $<
+
+ .c.t:
+ $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)