diff options
| author | minskim <minskim> | 2004-12-30 21:51:30 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2004-12-30 21:51:30 +0000 |
| commit | 84b102b59b3a16f535cef999748998911cc17df0 (patch) | |
| tree | 7d80592f1d7ff6f92a45b708c7e497546c6a79e2 /databases/db4 | |
| parent | 41bd79998e54d73ddafe99d8d1f7654ee6a428ea (diff) | |
| download | pkgsrc-84b102b59b3a16f535cef999748998911cc17df0.tar.gz | |
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 (limited to 'databases/db4')
| -rw-r--r-- | databases/db4/Makefile | 3 | ||||
| -rw-r--r-- | databases/db4/distinfo | 4 | ||||
| -rw-r--r-- | databases/db4/patches/patch-ab | 13 |
3 files changed, 15 insertions, 5 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index 9070f1f1c23..eddc57b0502 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -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 --git a/databases/db4/distinfo b/databases/db4/distinfo index a2a249b022d..9719492bc7f 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -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 --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab index 852b1d0eae6..bc16e5a496a 100644 --- a/databases/db4/patches/patch-ab +++ b/databases/db4/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.7 2004/12/27 04:27:50 jlam Exp $ 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 |