diff options
| author | joerg <joerg@pkgsrc.org> | 2005-11-11 18:18:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-11-11 18:18:28 +0000 |
| commit | c01ba26746bc064586bc39f5f0d1ac96f3bd5fbb (patch) | |
| tree | 87ec06c2d21e299ab4fef3e0b3da55d657929962 | |
| parent | 24e619dca7a2ffdb2a8a717aec7f5d3f68bc932f (diff) | |
| download | pkgsrc-c01ba26746bc064586bc39f5f0d1ac96f3bd5fbb.tar.gz | |
Replace hard-wired -lpthread with the normal pthread logic.
Since this changes nothing for platforms with working -lpthread
and others didn't work before, don't bump the revision.
| -rw-r--r-- | audio/libopendaap/Makefile | 7 | ||||
| -rw-r--r-- | audio/libopendaap/distinfo | 4 | ||||
| -rw-r--r-- | audio/libopendaap/patches/patch-ae | 13 | ||||
| -rw-r--r-- | audio/libopendaap/patches/patch-ag | 10 |
4 files changed, 32 insertions, 2 deletions
diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile index eecb0124274..0e9ae080af2 100644 --- a/audio/libopendaap/Makefile +++ b/audio/libopendaap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:11 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/11/11 18:18:28 joerg Exp $ DISTNAME= libopendaap-0.4.0 CATEGORIES= audio @@ -14,5 +14,10 @@ GNU_CONFIGURE= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_TOOLS+= pkg-config +SUBST_CLASSES+= pthread +SUBST_STAGE.pthread= pre-configure +SUBST_FILES.pthread= opendaap.pc.in +SUBST_SED.pthread= -e 's|@@PTHREAD@@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|' + .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo index db6f2c8d5ae..31be0d3e242 100644 --- a/audio/libopendaap/distinfo +++ b/audio/libopendaap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/10/01 18:13:17 kristerw Exp $ +$NetBSD: distinfo,v 1.11 2005/11/11 18:18:28 joerg Exp $ SHA1 (libopendaap-0.4.0.tar.bz2) = 5fe4382af7ecc97a6cb510ebec87b40d6cf6ef38 RMD160 (libopendaap-0.4.0.tar.bz2) = ed8732c6c487ef4902ff2d68552a66418cf2760d @@ -6,4 +6,6 @@ Size (libopendaap-0.4.0.tar.bz2) = 241953 bytes SHA1 (patch-aa) = c350abb98a94e21c12d03b585bcad97c9b926f74 SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1 +SHA1 (patch-ae) = 100264f35782e2ee44cfbbf1fc969c4689bd9593 SHA1 (patch-af) = ba10291fd391f1f8ba6258924b44b1886b43e98f +SHA1 (patch-ag) = cad5d2764258f4991491d673ab30f57c7c2b1646 diff --git a/audio/libopendaap/patches/patch-ae b/audio/libopendaap/patches/patch-ae new file mode 100644 index 00000000000..ae66ee463d9 --- /dev/null +++ b/audio/libopendaap/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.3 2005/11/11 18:18:28 joerg Exp $ + +--- Makefile.in.orig 2005-11-11 17:59:31.000000000 +0000 ++++ Makefile.in +@@ -150,7 +150,7 @@ libopendaap_la_SOURCES = client.c \ + ioloop.c ioloop.h \ + endian_swap.h + +-libopendaap_la_LDFLAGS = -version-number 0:1:0 -lpthread ++libopendaap_la_LDFLAGS = -version-number 0:1:0 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + libopendaap_la_LIBADD = authentication/libauthentication.la \ + debug/libdebug.la \ + mdnsd/libmdnsd.la diff --git a/audio/libopendaap/patches/patch-ag b/audio/libopendaap/patches/patch-ag new file mode 100644 index 00000000000..c3269c18c0f --- /dev/null +++ b/audio/libopendaap/patches/patch-ag @@ -0,0 +1,10 @@ +$NetBSD: patch-ag,v 1.3 2005/11/11 18:18:28 joerg Exp $ + +--- opendaap.pc.in.orig 2005-11-11 18:00:56.000000000 +0000 ++++ opendaap.pc.in +@@ -7,4 +7,4 @@ Name: opendaap + Description: Open DAAP library + Version: @VERSION@ + Cflags: -I${includedir} +-Libs: -L${libdir} -lopendaap -lpthread ++Libs: -L${libdir} -lopendaap @@PTHREAD@@ |