diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-17 18:47:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-17 18:47:19 +0000 |
| commit | b818a1b4ba89b2dabedaf398a58b0c9c24a5d7a5 (patch) | |
| tree | 345159be2b7ebbaddf4b3d0b3dd0d1278f719d5e | |
| parent | 0901a8c6c11d95f203479eeffd3fcc9dcba100d1 (diff) | |
| download | pkgsrc-b818a1b4ba89b2dabedaf398a58b0c9c24a5d7a5.tar.gz | |
Amend the previous commit... we also only care about pthreads if we're
non-GCC. DB4 uses its own code if we're using GCC instead of 1003.1
mutexes. Ride the previous PKGREVISION bump.
| -rw-r--r-- | databases/db4/Makefile | 11 | ||||
| -rw-r--r-- | databases/db4/buildlink3.mk | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index 17310dccba0..a81e9ea93b0 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/11/17 18:29:20 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/11/17 18:47:19 jlam Exp $ DISTNAME= db-4.2.52 PKGNAME= ${DISTNAME:S/db/db4/} @@ -47,10 +47,15 @@ CONFIGURE_ENV+= LIBSO_LIBS="${LIBSO_LIBS}" # DB4 only want pthreads because it's really after POSIX 1003.1 # inter-process mutexes. In this case, we only care to use the native -# threads. +# threads. We also only care if we're using a non-GCC compiler since +# we have code to use GCC assembly for mutexes instead of 1003.1 +# mutexes. # +.include "../../mk/compiler.mk" +.if empty(PKGSRC_COMPILER:Mgcc) PTHREAD_OPTS+= native -.include "../../mk/pthread.buildlink3.mk" +. include "../../mk/pthread.buildlink3.mk" +.endif post-install: ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/html/db4 diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 40009df2c80..a5890f6953c 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2004/11/17 18:29:20 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2004/11/17 18:47:19 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ @@ -30,6 +30,10 @@ BUILDLINK_TRANSFORM+= l:db:db4 . endif .endif # DB4_BUILDLINK3_MK -.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/compiler.mk" +.if empty(PKGSRC_COMPILER:Mgcc) +PTHREAD_OPTS+= native +. include "../../mk/pthread.buildlink3.mk" +.endif BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |