diff options
Diffstat (limited to 'databases/db5/patches/patch-ab')
| -rw-r--r-- | databases/db5/patches/patch-ab | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/databases/db5/patches/patch-ab b/databases/db5/patches/patch-ab index 2d4cd4de7ff..b1ad937e23c 100644 --- a/databases/db5/patches/patch-ab +++ b/databases/db5/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2011/10/03 10:54:46 adam Exp $ +$NetBSD: patch-ab,v 1.4 2012/01/18 13:46:50 adam Exp $ ---- dist/configure.orig 2011-09-14 14:30:12.000000000 +0000 +--- dist/configure.orig 2011-12-20 01:00:49.000000000 +0000 +++ dist/configure -@@ -5098,7 +5098,7 @@ bsdi3*) CC=${CC-"shlicc2"} +@@ -5112,7 +5112,7 @@ bsdi3*) CC=${CC-"shlicc2"} LIBSO_LIBS="$LIBSO_LIBS -lipc";; cygwin*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2011/10/03 10:54:46 adam Exp $ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread";; gnu*|k*bsd*-gnu|linux*) -@@ -6891,7 +6891,7 @@ fi +@@ -6905,7 +6905,7 @@ fi # we're using. case "$host_os" in sysv5UnixWare*|sysv5OpenUNIX8*) @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2011/10/03 10:54:46 adam Exp $ CPPFLAGS="$CPPFLAGS -pthread" LDFLAGS="$LDFLAGS -pthread" else -@@ -17698,7 +17698,7 @@ LIBTOOL="./libtool" +@@ -17712,7 +17712,7 @@ LIBTOOL="./libtool" INSTALLER="\$(LIBTOOL) --mode=install cp -p" MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.3 2011/10/03 10:54:46 adam Exp $ MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -@@ -18431,7 +18431,7 @@ if test "$_JTOPDIR" != "/usr"; then +@@ -18445,7 +18445,7 @@ if test "$_JTOPDIR" != "/usr"; then aix*) _JNI_INC_SUBDIRS="aix";; bsdi*) _JNI_INC_SUBDIRS="bsdos";; cygwin*) _JNI_INC_SUBDIRS="win32";; @@ -38,12 +38,12 @@ $NetBSD: patch-ab,v 1.3 2011/10/03 10:54:46 adam Exp $ hp*) _JNI_INC_SUBDIRS="hp-ux";; linux*) _JNI_INC_SUBDIRS="linux genunix";; osf*) _JNI_INC_SUBDIRS="alpha";; -@@ -20540,7 +20540,7 @@ if test "$db_cv_mutex" = no; then - # 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" +@@ -20565,7 +20565,7 @@ if test "$db_cv_mutex" = no; then + # avoid these probes for multiprocess pthreads. + ;; + *) +- 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 : |