diff options
Diffstat (limited to 'editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch | 80 |
1 files changed, 33 insertions, 47 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch index 97fec46bcef4..5039502f793d 100644 --- a/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice-1.1-devel/files/patch-berkeleydb+db-3.2.9.patch @@ -1,64 +1,50 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002 -+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002 -@@ -47,17 +47,27 @@ - --- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 - *************** - *** 1795,1800 **** ----- 1795,1802 ---- -+--- 1795,1803 ---- - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; - + netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +--- ../berkeleydb/db-3.2.9.patch.orig Fri Oct 18 22:02:26 2002 ++++ ../berkeleydb/db-3.2.9.patch Fri Oct 18 22:05:40 2002 +@@ -1,3 +1,13 @@ ++--- ./unxsols3.pro/misc/db-3.2.9/dist/configure.orig Fri Oct 18 21:46:44 2002 +++++ build/unxsols3.pro/db-3.2.9/dist/configure Fri Oct 18 21:48:47 2002 ++@@ -1795,6 +1795,7 @@ ++ case "$host_os" in ++ solaris*) JINCSUBDIRS="solaris";; ++ linux*) JINCSUBDIRS="linux genunix";; ++ freebsd*) JINCSUBDIRS="freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac ++ *) JINCSUBDIRS="genunix";; ++ esac ++ + *** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001 + --- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001 + *************** +@@ -43,3 +53,51 @@ - --- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 - +++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -+@@ -984,7 +984,7 @@ -+ optimize_def="-O2" -+ LIBS="-lipc $LIBS";; -+ bsdi*) optimize_def="-O2";; -+-freebsd*) optimize_def="-O2" -++freebsd*) optimize_def="-O" -+ CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" -+ LIBS="-pthread";; -+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - @@ -995,6 +995,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" -@@ -68,13 +78,22 @@ - #define HAVE_QNX 1 - --- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 - +++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 --@@ -1194,11 +1194,12 @@ + CC= @MAKEFILE_CC@ + CCLINK= @MAKEFILE_CCLINK@ ++--- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 +++++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 +@@ -1194,11 +1194,23 @@ - - 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' ++ ++ 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' - - else ++- else ++ need_version=no ++ fi ++ ;; ++ ++ freebsd*) ++ 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 -@@ -84,3 +103,24 @@ - fi - ;; - ++ 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 ++ ;; ++ +@@ -2019,6 +2031,20 @@ + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' + soname_spec='${libname}${release}.so$major' |