diff options
author | rh <rh> | 2003-01-21 12:43:37 +0000 |
---|---|---|
committer | rh <rh> | 2003-01-21 12:43:37 +0000 |
commit | 7605f103fba8f480314079c33ec46ac91efe7dd4 (patch) | |
tree | 9ae57d668e1390d6e9709a19fd36f19b53a8f108 /devel | |
parent | 90dd451c30be009737d8074256a09c33454d25f6 (diff) | |
download | pkgsrc-7605f103fba8f480314079c33ec46ac91efe7dd4.tar.gz |
Only link with -lpth if PTHREAD_TYPE == "pth"
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gnustep-base/Makefile | 14 | ||||
-rw-r--r-- | devel/gnustep-base/distinfo | 6 | ||||
-rw-r--r-- | devel/gnustep-base/patches/patch-aa | 6 | ||||
-rw-r--r-- | devel/gnustep-base/patches/patch-ab | 4 |
4 files changed, 21 insertions, 9 deletions
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile index 21e2b6b77c3..22373416773 100644 --- a/devel/gnustep-base/Makefile +++ b/devel/gnustep-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/01/03 04:04:35 rh Exp $ +# $NetBSD: Makefile,v 1.4 2003/01/21 12:43:37 rh Exp $ # DISTNAME= gnustep-base-1.5.1 @@ -9,6 +9,8 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnustep.org/ COMMENT= GNUstep foundation classes +PTHREAD_LIBS= -lpthread + USE_BUILDLINK2= YES USE_GMAKE= YES USE_X11= YES @@ -20,6 +22,11 @@ CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" pre-configure: ${SED} 's|@PREFIX@|${PREFIX}|g' <${FILESDIR}/openapp >${WRKDIR}/openapp +.for pfile in configure base.make.in + ${CP} ${WRKSRC}/${pfile} ${WRKSRC}/${pfile}.tmpl + ${SED} 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|g' \ + <${WRKSRC}/${pfile}.tmpl >${WRKSRC}/${pfile} +.endfor post-install: ${INSTALL_SCRIPT} ${WRKDIR}/openapp ${PREFIX}/bin @@ -31,4 +38,9 @@ post-install: .include "../../textproc/libxml2/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") +PTHREAD_LIBS+= -lpth +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo index b0dd2d169e9..1690b1647f5 100644 --- a/devel/gnustep-base/distinfo +++ b/devel/gnustep-base/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2003/01/03 04:04:36 rh Exp $ +$NetBSD: distinfo,v 1.4 2003/01/21 12:43:37 rh Exp $ SHA1 (gnustep-base-1.5.1.tar.gz) = cbd356cecb53143049d5af7871b8c52143f5225a Size (gnustep-base-1.5.1.tar.gz) = 1532722 bytes -SHA1 (patch-aa) = 94e38e52508ffb63fcbbbf0d4d65bf8e0a938e55 -SHA1 (patch-ab) = 7bdb0872bcc26f805137602411ef592abf28d30d +SHA1 (patch-aa) = 2f992eb695c72d47003720792cc010bd87ab259f +SHA1 (patch-ab) = 8ad3b2791730c7d647cd68a1845d7cbae0577c83 diff --git a/devel/gnustep-base/patches/patch-aa b/devel/gnustep-base/patches/patch-aa index 89578e564ad..12d7f9ebbef 100644 --- a/devel/gnustep-base/patches/patch-aa +++ b/devel/gnustep-base/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/27 10:58:44 rh Exp $ +$NetBSD: patch-aa,v 1.2 2003/01/21 12:43:38 rh Exp $ --- configure.orig Wed Sep 25 21:30:54 2002 +++ configure @@ -7,13 +7,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/09/27 10:58:44 rh Exp $ echo "$as_me:$LINENO: result: NeXT" >&5 echo "${ECHO_T}NeXT" >&6 - LIBOBJC='-lobjc' -+ LIBOBJC='-lobjc -lpthread -lpth' ++ LIBOBJC="-lobjc @PTHREAD_LIBS@" CPPFLAGS="$CPPFLAGS -fnext-runtime -DNeXT_RUNTIME" else echo "$as_me:$LINENO: result: GNU" >&5 echo "${ECHO_T}GNU" >&6 - LIBOBJC='-lobjc' -+ LIBOBJC='-lobjc -lpthread -lpth' ++ LIBOBJC='-lobjc @PTHREAD_LIBS@' CPPFLAGS="$CPPFLAGS -fgnu-runtime" fi diff --git a/devel/gnustep-base/patches/patch-ab b/devel/gnustep-base/patches/patch-ab index e5b59f56458..3c18f81d509 100644 --- a/devel/gnustep-base/patches/patch-ab +++ b/devel/gnustep-base/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/09/27 23:56:30 rh Exp $ +$NetBSD: patch-ab,v 1.2 2003/01/21 12:43:38 rh Exp $ --- base.make.in.orig Thu Jun 27 00:34:16 2002 +++ base.make.in @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1 2002/09/27 23:56:30 rh Exp $ FND_LDFLAGS = FND_LIBS = -lgnustep-base -+ OBJC_LIBS = -lobjc -lpthread -lpth ++ OBJC_LIBS = -lobjc @PTHREAD_LIBS@ FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1 GNUSTEP_DEFINE = -DGNUSTEP # If gc=yes was passed, use the appropriate library and defines |