summaryrefslogtreecommitdiff
path: root/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch')
-rw-r--r--editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch155
1 files changed, 69 insertions, 86 deletions
diff --git a/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch
index b3f090de1f03..e2928d1dbe54 100644
--- a/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch
+++ b/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch
@@ -1,61 +1,23 @@
--- ../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";;
+@@ -51,7 +51,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,1800 ****
----- 1796,1803 ----
-- case "$host_os" in
-- solaris*) JINCSUBDIRS="solaris";;
-- linux*) JINCSUBDIRS="linux genunix";;
--+ irix*) JINCSUBDIRS="irix";;
+++ netbsd*) optimize_def="-O";;
+ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ *qnx) cat >> confdefs.h <<\EOF
+ #define HAVE_QNX 1
+@@ -62,54 +62,57 @@
+ solaris*) JINCSUBDIRS="solaris";;
+ linux*) JINCSUBDIRS="linux genunix";;
+ + irix*) JINCSUBDIRS="irix";;
-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";;
-- *) JINCSUBDIRS="genunix";;
-- esac
--
-+@@ -984,9 +984,9 @@
-+ optimize_def="-O2"
-+ LIBS="-lipc $LIBS";;
-+ bsdi*) optimize_def="-O2";;
-+-freebsd*) optimize_def="-O2"
-+- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
-+- LIBS="-pthread";;
-++freebsd*) optimize_def="-O"
-++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS"
-++ LIBS="$PTHREAD_LIBS";;
-+ hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ 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";;
-++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";;
-+ *) JINCSUBDIRS="genunix";;
-+ esac
-+
+++ freebsd*) JINCSUBDIRS="linux solaris genunix";;
+ *) 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
-***************
@@ -84,49 +46,70 @@
- fi
- ;;
-
-+@@ -1194,11 +1194,12 @@
+-*** 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
+-***************
+-*** 1955,1961 ****
+- version_type=irix
+- need_lib_prefix=no
+- need_version=no
+-! soname_spec='${libname}${release}.so.$major'
+- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+- case "$host_os" in
+- irix5*)
+---- 1955,1961 ----
+- version_type=irix
+- need_lib_prefix=no
+- need_version=no
+-! soname_spec='${libname}${release}.so'
+- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+- case "$host_os" in
+- irix5*)
++@@ -1202,6 +1202,17 @@
++ fi
++ ;;
+
-+ 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
+++ 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
++ 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
-+ ;;
-+
-+@@ -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 @@
+++ fi
+++ ;;
+++
++ solaris* | sysv5*)
++ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++ ld_shlibs=no
++@@ -1955,7 +1966,7 @@
++ version_type=irix
++ need_lib_prefix=no
++ need_version=no
++- soname_spec='${libname}${release}.so.$major'
+++ soname_spec='${libname}${release}.so'
++ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
++ case "$host_os" in
++ irix5*)
++@@ -2019,6 +2030,20 @@
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
+++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++freebsd*)
++ version_type=sunos
-++ 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'
+++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+++ dynamic_linker='FreeBSD (a.out) ld.so'
+++ else
+++ 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'
++ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-+
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 09:57:57 +0000