summaryrefslogtreecommitdiff
path: root/databases/db4/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'databases/db4/patches/patch-ab')
-rw-r--r--databases/db4/patches/patch-ab18
1 files changed, 10 insertions, 8 deletions
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 7fd5074de1c..73cd1c281f0 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,6 +1,8 @@
--- dist/configure.orig 2007-09-27 18:32:04 +0300
+++ dist/configure 2008-05-09 01:20:00 +0300
-@@ -5938,6 +5938,7 @@ db_cv_gxx_except=no;
+--- dist/configure.orig 2008-05-15 23:12:41.000000000 +0200
++++ dist/configure
+@@ -5913,6 +5913,7 @@ db_cv_gxx_except=no;
if test "$GXX" = "yes"; then
GXX_VERSION=`${MAKEFILE_CXX} --version`
case ${GXX_VERSION} in
@@ -8,7 +10,7 @@
1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
db_cv_gxx_except=yes;;
esac
-@@ -5954,7 +5955,7 @@ fi
+@@ -5929,7 +5930,7 @@ fi
# we're using.
case "$host_os" in
sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -17,7 +19,7 @@
CPPFLAGS="$CPPFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
else
-@@ -21078,7 +21079,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21053,7 +21054,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
SOFLAGS="-rpath \$(libdir)"
@@ -25,7 +27,7 @@
# Set SOSUFFIX and friends
-@@ -21170,7 +21170,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
+@@ -21145,7 +21145,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -34,16 +36,16 @@
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -21937,7 +21937,7 @@ if test "$_JTOPDIR" != "/usr"; then
- case "$host_os" in
+@@ -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";;
-@@ -28547,10 +28547,12 @@ typedef FILE ac__type_new_;
+@@ -28529,10 +28529,12 @@ typedef FILE * ac__type_new_;
int
main ()
{
@@ -56,7 +58,7 @@
;
return 0;
}
-@@ -29859,7 +29861,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -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.