diff options
| author | joerg <joerg> | 2006-01-12 16:45:37 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-01-12 16:45:37 +0000 |
| commit | 7481760209f276af52d096709b7276342d971013 (patch) | |
| tree | b28326136dd05cb826ff14ca24a6ad82a533f1c2 /audio | |
| parent | fad9a75759c93b8015527051988e146ccd145a03 (diff) | |
| download | pkgsrc-7481760209f276af52d096709b7276342d971013.tar.gz | |
Don't ask CPP for FreeBSD, just use PTHREAD_* for thread linkage.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/daapd/distinfo | 4 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-aa | 21 |
2 files changed, 19 insertions, 6 deletions
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index 0d4a088e018..c800fe15bce 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2006/01/01 18:32:01 tron Exp $ +$NetBSD: distinfo,v 1.11 2006/01/12 16:45:37 joerg Exp $ SHA1 (daapd-0.2.4a.tgz) = 175130c8b709fcac124857fe5a9eacdfbe00153c RMD160 (daapd-0.2.4a.tgz) = ca3bf641693779af359cfe1c1b91c7b06cfaaa10 Size (daapd-0.2.4a.tgz) = 205231 bytes -SHA1 (patch-aa) = eb8bc48668206d79b32b43ac5aafc43a19c217a8 +SHA1 (patch-aa) = 805ec9d503e78e810f90135535d7a36c351629a9 diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa index 0526153b1fa..2432fc43435 100644 --- a/audio/daapd/patches/patch-aa +++ b/audio/daapd/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.9 2006/01/01 18:32:01 tron Exp $ +$NetBSD: patch-aa,v 1.10 2006/01/12 16:45:37 joerg Exp $ --- makefile.orig 2005-01-04 23:18:48.000000000 +0000 -+++ makefile 2006-01-01 18:17:40.000000000 +0000 ++++ makefile @@ -1,6 +1,6 @@ # configure daapd here @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.9 2006/01/01 18:32:01 tron Exp $ ZLIB_ENABLE = 1 MPEG4_ENABLE = 0 -@@ -8,22 +8,22 @@ +@@ -8,22 +8,22 @@ MPEG4_ENABLE = 0 # no need to touch anything below this line # ----------------------------------------- @@ -40,7 +40,20 @@ $NetBSD: patch-aa,v 1.9 2006/01/01 18:32:01 tron Exp $ endif HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) INCPATH := $(INCPATH) -I$(HOWLRECENT) -@@ -80,8 +80,6 @@ +@@ -46,11 +46,7 @@ ifneq ($(shell $(CC) -E -dM - < /dev/nul + LIBS := $(LIBS) -lsocket -lnsl + endif + +-ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __FreeBSD__),) +- LIBS := $(LIBS) -pthread +-else +- LIBS := $(LIBS) -lpthread +-endif ++LIBS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + + ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __sgi__),) + LIBS := $(LIBS) /usr/lib/snprintf.o +@@ -80,8 +76,6 @@ clean: rm $(OBJS) $(TARGET) install: $(DEPS) $(TARGET) |