[pkgsrc/trunk]: pkgsrc/databases/db4 Amend the previous commit... we also onl...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/beb42d9e5c77
branches:  trunk
changeset: 483705:beb42d9e5c77
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 17 18:47:19 2004 +0000

description:
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.

diffstat:

 databases/db4/Makefile      |  11 ++++++++---
 databases/db4/buildlink3.mk |   8 ++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 42a05797f7ab -r beb42d9e5c77 databases/db4/Makefile
--- a/databases/db4/Makefile    Wed Nov 17 18:29:20 2004 +0000
+++ b/databases/db4/Makefile    Wed Nov 17 18:47:19 2004 +0000
@@ -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 @@
 
 # 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 -r 42a05797f7ab -r beb42d9e5c77 databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk       Wed Nov 17 18:29:20 2004 +0000
+++ b/databases/db4/buildlink3.mk       Wed Nov 17 18:47:19 2004 +0000
@@ -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 @@
 .  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/+$//}