[pkgsrc/trunk]: pkgsrc/databases/db4 Use the -pthread option only when pthrea...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce9f929a1c90
branches:  trunk
changeset: 486624:ce9f929a1c90
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Dec 30 21:51:30 2004 +0000

description:
Use the -pthread option only when pthread is enabled.  Previously, the
configure script still used -pthread during the POSIX mutex test even
when we explicitly disabled pthread through CONFIGURE_ENV, resulting
in re-enabling pthread.

Bump PKGREVISION.

diffstat:

 databases/db4/Makefile         |   3 ++-
 databases/db4/distinfo         |   4 ++--
 databases/db4/patches/patch-ab |  13 +++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 0044d8f320ac -r ce9f929a1c90 databases/db4/Makefile
--- a/databases/db4/Makefile    Thu Dec 30 21:49:14 2004 +0000
+++ b/databases/db4/Makefile    Thu Dec 30 21:51:30 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2004/12/27 04:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2004/12/30 21:51:30 minskim Exp $
 
 DISTNAME=              db-4.3.21
 PKGNAME=               ${DISTNAME:S/db/db4/}
+PKGREVISION=           1
 CATEGORIES=            databases
 MASTER_SITES=          http://www.sleepycat.com/update/snapshot/
 
diff -r 0044d8f320ac -r ce9f929a1c90 databases/db4/distinfo
--- a/databases/db4/distinfo    Thu Dec 30 21:49:14 2004 +0000
+++ b/databases/db4/distinfo    Thu Dec 30 21:51:30 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2004/12/27 04:27:49 jlam Exp $
+$NetBSD: distinfo,v 1.12 2004/12/30 21:51:30 minskim Exp $
 
 SHA1 (db-4.3.21.tar.gz) = 3b4e295c2ea61ba258da2b9a945f6d8d1b587fd9
 Size (db-4.3.21.tar.gz) = 5916550 bytes
 SHA1 (patch-aa) = 0ab7730d6eb4e1a93c9ca4dcf15f2b28c794d972
-SHA1 (patch-ab) = 6c8df0f11950a75af0818b3a3070bbb9e0f99280
+SHA1 (patch-ab) = 28b408c783225583e3d387ab2dae381752d2a923
 SHA1 (patch-ac) = d31cb82810577003de202ac81e91aa15108147c7
diff -r 0044d8f320ac -r ce9f929a1c90 databases/db4/patches/patch-ab
--- a/databases/db4/patches/patch-ab    Thu Dec 30 21:49:14 2004 +0000
+++ b/databases/db4/patches/patch-ab    Thu Dec 30 21:51:30 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2004/12/27 04:27:50 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2004/12/30 21:51:30 minskim Exp $
 
---- dist/configure.orig        2004-11-08 20:28:06.000000000 -0500
+--- dist/configure.orig        2004-11-08 19:28:06.000000000 -0600
 +++ dist/configure
 @@ -5417,6 +5417,7 @@ db_cv_gxx_except=no;
  if test "$GXX" = "yes"; then
@@ -19,3 +19,12 @@
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
+@@ -30024,7 +30025,7 @@ fi
+ #
+ # If the user specified we use POSIX pthreads mutexes, and we fail to find the
+ # full interface, try and configure for just intra-process support.
+-if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
++if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
+       LIBS="$LIBS -lpthread"
+ 
+ if test "$cross_compiling" = yes; then