diff options
author | jlam <jlam@pkgsrc.org> | 2004-11-17 07:10:45 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-11-17 07:10:45 +0000 |
commit | 8e4353cf1caf284df4cb9ba3db5b5572ffbb3572 (patch) | |
tree | 13ba3dd8c33c2f25060b7addb8122f538d7e6633 /databases/db4 | |
parent | cf8362aa2813a65dacfc28e8cf401eefe8017b47 (diff) | |
download | pkgsrc-8e4353cf1caf284df4cb9ba3db5b5572ffbb3572.tar.gz |
x86_64 supports the same test-and-set method as x86, so use it instead
of relying on UNIX/fnctl, which can block all threads between processes
and cause certain mutex assumptions to fail.
Diffstat (limited to 'databases/db4')
-rw-r--r-- | databases/db4/distinfo | 4 | ||||
-rw-r--r-- | databases/db4/patches/patch-ab | 21 |
2 files changed, 17 insertions, 8 deletions
diff --git a/databases/db4/distinfo b/databases/db4/distinfo index 39aae3e2ec6..842d5d477f6 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2004/11/10 15:51:23 jlam Exp $ +$NetBSD: distinfo,v 1.10 2004/11/17 07:10:45 jlam Exp $ SHA1 (db-4.2.52.tar.gz) = 12d21a58efd7b5fd35b56815a8fb1ac2cbab2e5c Size (db-4.2.52.tar.gz) = 4073147 bytes @@ -7,5 +7,5 @@ Size (patch.4.2.52.1) = 988 bytes SHA1 (patch.4.2.52.2) = ef55711f1bf643024d9d90f9b3885299f6c7b09a Size (patch.4.2.52.2) = 1433 bytes SHA1 (patch-aa) = 2a3db19cb2b18926531b1b7fc342d0caef78f67c -SHA1 (patch-ab) = 4b4831ddb27a07c74d6e7a49ce0fad2b3ac2e740 +SHA1 (patch-ab) = af89cccbfe7ed8b5ee75afa9445d7b0e11554525 SHA1 (patch-ac) = b22889222bfd358226bba9af3479350ec053259c diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab index ea3591e0dcf..41820596fad 100644 --- a/databases/db4/patches/patch-ab +++ b/databases/db4/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2004/11/10 15:51:23 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2004/11/17 07:10:45 jlam Exp $ ---- dist/configure.orig 2003-12-03 22:10:02.000000000 +0100 -+++ dist/configure 2004-04-07 17:00:04.000000000 +0200 -@@ -5390,6 +5390,7 @@ +--- dist/configure.orig 2003-12-03 16:10:02.000000000 -0500 ++++ dist/configure +@@ -5390,6 +5390,7 @@ db_cv_gxx_except=no; if test "$GXX" = "yes"; then GXX_VERSION=`${MAKEFILE_CXX} --version` case ${GXX_VERSION} in @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.5 2004/11/10 15:51:23 jlam Exp $ 1.*|2.[01234567].*|*-1.*|*-2.[01234567].*) db_cv_gxx_except=yes;; esac -@@ -20138,7 +20139,7 @@ +@@ -20138,7 +20139,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6 INSTALLER="\$(LIBTOOL) --mode=install cp -p" MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" @@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.5 2004/11/10 15:51:23 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" -@@ -27047,6 +27048,7 @@ +@@ -27047,6 +27048,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 if test $ac_cv_lib_pthread_main = yes; then LOAD_LIBS="$LOAD_LIBS -lpthread" @@ -27,3 +27,12 @@ $NetBSD: patch-ab,v 1.5 2004/11/10 15:51:23 jlam Exp $ fi ac_cv_lib_pthread=ac_cv_lib_pthread_main +@@ -28525,7 +28527,7 @@ int + main () + { + +-#if (defined(i386) || defined(__i386__)) && defined(__GNUC__) ++#if (defined(i386) || defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__) + exit(0); + #else + FAIL TO COMPILE/LINK |