summaryrefslogtreecommitdiff
path: root/databases/db4/patches/patch-ab
blob: 8af701bf7d3ee162d842be720402373f98e0f79d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
$NetBSD: patch-ab,v 1.21 2009/07/09 06:37:41 hasso Exp $

--- dist/configure.orig	2008-05-16 00:12:41 +0300
+++ dist/configure	2009-07-09 08:48:34 +0300
@@ -3716,7 +3716,7 @@ bsdi3*)	CC=${CC-"shlicc2"}
 	LIBSO_LIBS="$LIBSO_LIBS -lipc";;
 cygwin*)
 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
-freebsd*)
+freebsd*|dragonfly*)
 	CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
 	LDFLAGS="$LDFLAGS -pthread";;
 gnu*|k*bsd*-gnu|linux*)
@@ -5913,6 +5913,7 @@ db_cv_gxx_except=no;
 if test "$GXX" = "yes"; then
 	GXX_VERSION=`${MAKEFILE_CXX} --version`
 	case ${GXX_VERSION} in
+	egcs*)	CXXFLAGS="-fexceptions $CXXFLAGS";;
 	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
 		db_cv_gxx_except=yes;;
 	esac
@@ -5929,7 +5930,7 @@ fi
 # we're using.
 case "$host_os" in
 sysv5UnixWare*|sysv5OpenUNIX8*)
-	if test "$GCC" == "yes"; then
+	if test "$GCC" = "yes"; then
 		CPPFLAGS="$CPPFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
 	else
@@ -21053,7 +21054,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
 
 
 SOFLAGS="-rpath \$(libdir)"
-LIBTOOL_PROG="${SHELL} ./libtool"
 
 # Set SOSUFFIX and friends
 
@@ -21145,7 +21145,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
 INSTALLER="\$(LIBTOOL) --mode=install cp -p"
 
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
@@ -21918,7 +21918,7 @@ if test "$_JTOPDIR" != "/usr"; then
 	aix*)		_JNI_INC_SUBDIRS="aix";;
 	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
 	cygwin*)	_JNI_INC_SUBDIRS="win32";;
-	freebsd*)	_JNI_INC_SUBDIRS="freebsd";;
+	freebsd*|dragonfly*)	_JNI_INC_SUBDIRS="freebsd";;
 	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
 	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
 	osf*)		_JNI_INC_SUBDIRS="alpha";;
@@ -28529,10 +28529,12 @@ typedef FILE * ac__type_new_;
 int
 main ()
 {
+#ifndef __DragonFly__
 if ((ac__type_new_ *) 0)
   return 0;
 if (sizeof (ac__type_new_))
   return 0;
+#endif
   ;
   return 0;
 }
@@ -29904,7 +29906,7 @@ rm -f core conftest.err conftest.$ac_obj
 	# 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