2003-01-21 23:13:13 +01:00
|
|
|
--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003
|
|
|
|
+++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003
|
|
|
|
@@ -45,52 +45,82 @@
|
|
|
|
CCLINK= @MAKEFILE_CCLINK@
|
|
|
|
*** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001
|
|
|
|
--- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003
|
|
|
|
-***************
|
|
|
|
-*** 995,1000 ****
|
|
|
|
---- 995,1001 ----
|
|
|
|
- CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
|
|
|
|
- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
|
|
|
|
- LIBS="-lsocket -lsvipc $LIBS";;
|
|
|
|
-+ netbsd*) optimize_def="-O2";;
|
|
|
|
- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
|
|
|
|
- *qnx) cat >> confdefs.h <<\EOF
|
|
|
|
- #define HAVE_QNX 1
|
|
|
|
-***************
|
|
|
|
-*** 1795,1800 ****
|
|
|
|
---- 1796,1803 ----
|
|
|
|
- case "$host_os" in
|
|
|
|
- solaris*) JINCSUBDIRS="solaris";;
|
|
|
|
- linux*) JINCSUBDIRS="linux genunix";;
|
|
|
|
-+ irix*) JINCSUBDIRS="irix";;
|
|
|
|
-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
|
|
|
|
- *) JINCSUBDIRS="genunix";;
|
|
|
|
- esac
|
|
|
|
-
|
|
|
|
+@@ -984,9 +984,9 @@
|
2002-04-15 18:56:50 +02:00
|
|
|
+ optimize_def="-O2"
|
|
|
|
+ LIBS="-lipc $LIBS";;
|
|
|
|
+ bsdi*) optimize_def="-O2";;
|
|
|
|
+-freebsd*) optimize_def="-O2"
|
2003-01-21 23:13:13 +01:00
|
|
|
+- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
|
|
|
|
+- LIBS="-pthread";;
|
2002-04-15 18:56:50 +02:00
|
|
|
++freebsd*) optimize_def="-O"
|
2003-01-21 23:13:13 +01:00
|
|
|
++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
|
|
|
|
++ LIBS="$PTHREAD_LIBS";;
|
2002-04-15 18:56:50 +02:00
|
|
|
+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
|
2003-01-21 23:13:13 +01:00
|
|
|
+ irix*) optimize_def="-O2"
|
|
|
|
+ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
|
|
|
|
+@@ -995,6 +995,7 @@
|
|
|
|
+ CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
|
|
|
|
+ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
|
|
|
|
+ LIBS="-lsocket -lsvipc $LIBS";;
|
|
|
|
++netbsd*) optimize_def="-O2";;
|
|
|
|
+ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
|
|
|
|
+ *qnx) cat >> confdefs.h <<\EOF
|
|
|
|
+ #define HAVE_QNX 1
|
|
|
|
+@@ -1795,6 +1796,9 @@
|
|
|
|
+ case "$host_os" in
|
|
|
|
+ solaris*) JINCSUBDIRS="solaris";;
|
|
|
|
+ linux*) JINCSUBDIRS="linux genunix";;
|
|
|
|
++ irix*) JINCSUBDIRS="irix";;
|
|
|
|
++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
|
2003-01-25 20:55:09 +01:00
|
|
|
++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";;
|
2003-01-21 23:13:13 +01:00
|
|
|
+ *) JINCSUBDIRS="genunix";;
|
|
|
|
+ esac
|
|
|
|
+
|
|
|
|
*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000
|
|
|
|
--- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003
|
|
|
|
-***************
|
|
|
|
-*** 1194,1204 ****
|
|
|
|
-
|
|
|
|
- netbsd*)
|
|
|
|
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
|
|
-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
|
|
|
|
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
|
-- else
|
|
|
|
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
|
|
|
|
- # can we support soname and/or expsyms with a.out? -oliva
|
|
|
|
- fi
|
|
|
|
- ;;
|
|
|
|
-
|
|
|
|
---- 1194,1205 ----
|
|
|
|
-
|
|
|
|
- netbsd*)
|
|
|
|
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
|
|
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
|
|
|
|
- # can we support soname and/or expsyms with a.out? -oliva
|
|
|
|
-+ else
|
|
|
|
-+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
|
|
|
|
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
|
-+ need_version=no
|
|
|
|
- fi
|
|
|
|
- ;;
|
|
|
|
-
|
|
|
|
+@@ -1194,11 +1194,12 @@
|
|
|
|
+
|
|
|
|
+ netbsd*)
|
|
|
|
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
|
|
+- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
|
|
|
|
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
|
+- else
|
|
|
|
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
|
|
|
|
+ # can we support soname and/or expsyms with a.out? -oliva
|
2002-03-05 18:22:52 +01:00
|
|
|
++ else
|
2003-01-21 23:13:13 +01:00
|
|
|
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
|
|
|
|
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
2002-03-05 18:22:52 +01:00
|
|
|
++ need_version=no
|
2003-01-21 23:13:13 +01:00
|
|
|
+ fi
|
|
|
|
+ ;;
|
|
|
|
+
|
|
|
|
+@@ -1365,10 +1366,13 @@
|
|
|
|
+
|
|
|
|
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
|
|
|
+ freebsd*)
|
|
|
|
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
|
|
|
|
++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
|
|
|
|
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \
|
|
|
|
++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
|
|
+ hardcode_direct=yes
|
|
|
|
+ hardcode_shlibpath_var=no
|
|
|
|
++ need_version=no
|
|
|
|
+ ;;
|
|
|
|
+
|
|
|
|
+ hpux9* | hpux10* | hpux11*)
|
|
|
|
+@@ -2020,6 +2024,14 @@
|
2002-04-15 18:56:50 +02:00
|
|
|
+ soname_spec='${libname}${release}.so$major'
|
|
|
|
+ dynamic_linker='NetBSD ld.elf_so'
|
2003-01-21 23:13:13 +01:00
|
|
|
+ fi
|
2002-04-15 18:56:50 +02:00
|
|
|
++ shlibpath_var=LD_LIBRARY_PATH
|
|
|
|
++ ;;
|
|
|
|
++
|
|
|
|
++freebsd*)
|
|
|
|
++ version_type=sunos
|
2003-01-21 23:13:13 +01:00
|
|
|
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
|
|
|
|
++ soname_spec='${libname}${release}.so$major'
|
|
|
|
++ dynamic_linker='FreeBSD ld.elf_so'
|
2002-04-15 18:56:50 +02:00
|
|
|
+ shlibpath_var=LD_LIBRARY_PATH
|
|
|
|
+ ;;
|
2003-01-21 23:13:13 +01:00
|
|
|
+
|