diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-06-04 03:00:57 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-06-04 03:00:57 +0000 |
| commit | d53c696955d15c99807ed506ac9c5d440d24c52f (patch) | |
| tree | 3a4f32017015e2dbfa1ed9be2a223de6d1fb48e8 /audio | |
| parent | Respect CC and CFLAGS, and remove a bogus patch which deliberately (diff) | |
Unbreak on current by using ${CXX} to compile instead of ${CC},
and #include <string.h> to get strcmp() prototype
Notes
Notes:
svn path=/head/; revision=60567
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/cd-console/files/patch-aa | 28 | ||||
| -rw-r--r-- | audio/cd-console/files/patch-ac | 8 |
2 files changed, 28 insertions, 8 deletions
diff --git a/audio/cd-console/files/patch-aa b/audio/cd-console/files/patch-aa index 5743c549d238..9c5a0941e336 100644 --- a/audio/cd-console/files/patch-aa +++ b/audio/cd-console/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Nov 28 20:08:56 1999 -+++ Makefile Sat Nov 11 14:14:53 2000 -@@ -5,24 +5,24 @@ +--- Makefile.orig Sat Aug 25 11:09:00 2001 ++++ Makefile Mon Jun 3 19:55:53 2002 +@@ -5,43 +5,46 @@ # very welcome). # for linux @@ -32,16 +32,28 @@ +#CC = gcc all: - make cd-console -@@ -38,10 +38,13 @@ - $(CC) -c cd_ll_linux.cpp $(CFLAGS) + make cd-console + strip cd-console + + cd-console: $(OBJS) +- $(CC) $(OBJS) $(LIBS) -o cd-console $(CFLAGS) ++ $(CXX) $(OBJS) $(LIBS) -o cd-console $(CFLAGS) + + cd-console.o: cd.h cd-console.cpp +- $(CC) -c cd-console.cpp $(CFLAGS) ++ $(CXX) -c cd-console.cpp $(CFLAGS) + + cd_ll_linux.o: cd_ll.h cd_ll_linux.h cd_ll_linux.cpp +- $(CC) -c cd_ll_linux.cpp $(CFLAGS) ++ $(CXX) -c cd_ll_linux.cpp $(CFLAGS) cd_ll_bsd.o: cd_ll.h cd_ll_bsd.h cd_ll_bsd.cpp - $(CC) -c cd_ll_bsd.cpp $(CFLAGS) -+ $(CC) -c -DDEVICE=$(CDDEVICE) cd_ll_bsd.cpp $(CFLAGS) ++ $(CXX) -c -DDEVICE=$(CDDEVICE) cd_ll_bsd.cpp $(CFLAGS) cd.o: cd.h cd.cpp - $(CC) -c cd.cpp $(CFLAGS) +- $(CC) -c cd.cpp $(CFLAGS) ++ $(CXX) -c cd.cpp $(CFLAGS) clean: rm -f $(OBJS) cd-console diff --git a/audio/cd-console/files/patch-ac b/audio/cd-console/files/patch-ac new file mode 100644 index 000000000000..a3f1bb1fe3b3 --- /dev/null +++ b/audio/cd-console/files/patch-ac @@ -0,0 +1,8 @@ +--- cd-console.cpp.orig Mon Jun 3 19:46:12 2002 ++++ cd-console.cpp Mon Jun 3 19:46:01 2002 +@@ -1,4 +1,5 @@ + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + + #ifdef OS_BSD |