* [gentoo-commits] gentoo-x86 commit in media-sound/cdparanoia/files: cdparanoia-3.10_pre0-Makefile.in.patch
@ 2007-10-20 17:58 Samuli Suominen (drac)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (drac) @ 2007-10-20 17:58 UTC (permalink / raw
To: gentoo-commits
drac 07/10/20 17:58:21
Modified: cdparanoia-3.10_pre0-Makefile.in.patch
Log:
..to be continued.
(Portage version: 2.1.3.15)
Revision Changes Path
1.2 media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
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
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
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
Index: cdparanoia-3.10_pre0-Makefile.in.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdparanoia-3.10_pre0-Makefile.in.patch 20 Oct 2007 17:36:52 -0000 1.1
+++ cdparanoia-3.10_pre0-Makefile.in.patch 20 Oct 2007 17:58:20 -0000 1.2
@@ -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 @@
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)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/cdparanoia/files: cdparanoia-3.10_pre0-Makefile.in.patch
@ 2007-10-21 15:08 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2007-10-21 15:08 UTC (permalink / raw
To: gentoo-commits
aballier 07/10/21 15:08:22
Modified: cdparanoia-3.10_pre0-Makefile.in.patch
Log:
compile objects twice, once pic for shared libs, once nonpic for static one
(Portage version: 2.1.3.15)
Revision Changes Path
1.3 media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch
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
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
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
Index: cdparanoia-3.10_pre0-Makefile.in.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/files/cdparanoia-3.10_pre0-Makefile.in.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdparanoia-3.10_pre0-Makefile.in.patch 20 Oct 2007 17:58:20 -0000 1.2
+++ cdparanoia-3.10_pre0-Makefile.in.patch 21 Oct 2007 15:08:21 -0000 1.3
@@ -1,7 +1,8 @@
-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:53:40.000000000 +0300
-@@ -10,6 +10,7 @@
+Index: cdparanoia-III-10pre0/interface/Makefile.in
+===================================================================
+--- cdparanoia-III-10pre0.orig/interface/Makefile.in
++++ cdparanoia-III-10pre0/interface/Makefile.in
+@@ -10,6 +10,7 @@ srcdir=@srcdir@
FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
OPT=@OPT@ $(FLAGS)
DEBUG=@DEBUG@ -DCDDA_TEST
@@ -9,7 +10,16 @@
CC=@CC@
LD=@CC@
LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -32,8 +33,7 @@
+@@ -20,6 +21,8 @@ CPPFLAGS+=-D_REENTRANT
+
+ OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\
+ scsi_interface.o smallft.o toc.o test_interface.o
++LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\
++ scsi_interface.lo smallft.lo toc.lo test_interface.lo
+
+ export VERSION
+
+@@ -32,8 +35,7 @@ lib:
$(MAKE) libcdda_interface.a CFLAGS="$(OPT)"
slib:
@@ -19,25 +29,31 @@
[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
test:
-@@ -46,12 +46,12 @@
+@@ -45,14 +47,17 @@ libcdda_interface.a: $(OFILES)
+ $(AR) -r libcdda_interface.a $(OFILES)
$(RANLIB) libcdda_interface.a
- libcdda_interface.so: $(OFILES)
+-libcdda_interface.so: $(OFILES)
- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
-+ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++libcdda_interface.so: $(LOFILES)
++ $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(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 $<
+ $(CC) $(CFLAGS) -c $<
++%.lo: %.c
++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
++
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:57:07.000000000 +0300
-@@ -11,6 +11,7 @@
+
+Index: cdparanoia-III-10pre0/paranoia/Makefile.in
+===================================================================
+--- cdparanoia-III-10pre0.orig/paranoia/Makefile.in
++++ cdparanoia-III-10pre0/paranoia/Makefile.in
+@@ -11,6 +11,7 @@ srcdir=@srcdir@
FLAGS=@TYPESIZES@ @CFLAGS@
OPT=@OPT@ $(FLAGS)
DEBUG=@DEBUG@
@@ -45,8 +61,11 @@
CC=@CC@
LD=@CC@
LDFLAGS=@LDFLAGS@ $(FLAGS)
-@@ -21,7 +22,7 @@
+@@ -19,9 +20,10 @@ RANLIB=@RANLIB@
+ CPPFLAGS+=-D_REENTRANT
+
OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
++LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo
#TFILES = isort.t gap.t p_block.t paranoia.t
-LIBS = ../interface/libcdda_interface.a -lm
@@ -54,7 +73,7 @@
export VERSION
all: lib slib
-@@ -33,8 +34,7 @@
+@@ -33,8 +35,7 @@ lib:
$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
slib:
@@ -64,18 +83,23 @@
#test: $(TFILES)
#
-@@ -44,12 +44,12 @@
+@@ -43,14 +44,17 @@ libcdda_paranoia.a: $(OFILES)
+ $(AR) -r libcdda_paranoia.a $(OFILES)
$(RANLIB) libcdda_paranoia.a
- libcdda_paranoia.so: $(OFILES)
+-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) $(LIBFLAGS) -L ../interface -lcdda_interface
++libcdda_paranoia.so: $(LOFILES)
++ $(CC) $(LOFILES) -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 $<
+ $(CC) $(CFLAGS) -c $<
++%.lo: %.c
++ $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
++
.c.t:
$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
+ $@
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-21 15:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-20 17:58 [gentoo-commits] gentoo-x86 commit in media-sound/cdparanoia/files: cdparanoia-3.10_pre0-Makefile.in.patch Samuli Suominen (drac)
-- strict thread matches above, loose matches on Subject: below --
2007-10-21 15:08 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox