diff options
| author | drochner <drochner@pkgsrc.org> | 2010-09-07 10:46:47 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-09-07 10:46:47 +0000 |
| commit | 2e3185e7cb57e3f6d2696c1fa2312a052d02b516 (patch) | |
| tree | a54efa493deeccee1732880727aac00be8979f91 /devel/pth | |
| parent | 37023379d186ec5e553149cf5a38c71e30818b36 (diff) | |
| download | pkgsrc-2e3185e7cb57e3f6d2696c1fa2312a052d02b516.tar.gz | |
don't install the pthread drop-in emulation header and library in case
native pthreads are present and used, to avoid surprises due to
conflicting implementations mixed up (in case of no bl3 use), from
Rumko per followup mail on PR pkg/43845
bump PKGREVISION
Diffstat (limited to 'devel/pth')
| -rw-r--r-- | devel/pth/Makefile | 13 | ||||
| -rw-r--r-- | devel/pth/PLIST | 12 |
2 files changed, 16 insertions, 9 deletions
diff --git a/devel/pth/Makefile b/devel/pth/Makefile index 27590f289dc..539ac65c6dc 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.72 2010/08/06 19:21:26 drochner Exp $ +# $NetBSD: Makefile,v 1.73 2010/09/07 10:46:47 drochner Exp $ # DISTNAME= pth-2.0.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=pth/} @@ -19,7 +19,6 @@ MAKE_JOBS_SAFE= no USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-pthread CONFIGURE_ARGS+= --with-fdsetsize=1024 #CONFIGURE_ARGS+= --enable-debug @@ -39,6 +38,14 @@ CONFIGURE_ENV+= ac_cv_check_nfdstype='unsigned int' CONFIGURE_ENV+= ac_cv_typedef_nfds_t=no # in <poll.h>, but that's unused .endif +PLIST_VARS+= pthread + +.include "../../mk/pthread.buildlink3.mk" +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" +CONFIGURE_ARGS+= --enable-pthread +PLIST.pthread= yes +.endif + INSTALLATION_DIRS= share/doc/pth post-install: diff --git a/devel/pth/PLIST b/devel/pth/PLIST index c6068a42640..b85b394ffcb 100644 --- a/devel/pth/PLIST +++ b/devel/pth/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:03 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2010/09/07 10:46:47 drochner Exp $ bin/pth-config -bin/pthread-config +${PLIST.pthread}bin/pthread-config include/pth.h -include/pthread.h +${PLIST.pthread}include/pthread.h lib/libpth.la -lib/libpthread.la +${PLIST.pthread}lib/libpthread.la man/man1/pth-config.1 -man/man1/pthread-config.1 +${PLIST.pthread}man/man1/pthread-config.1 man/man3/pth.3 -man/man3/pthread.3 +${PLIST.pthread}man/man3/pthread.3 share/aclocal/pth.m4 share/doc/pth/ANNOUNCE share/doc/pth/AUTHORS |