summaryrefslogtreecommitdiff
path: root/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch
blob: 9540987d0f65f1a9c9446421b0f7294e4f2d1b70 (plain) (blame)
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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
--- ../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 @@
+ 	   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 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
-***************
-*** 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
++    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 @@
+     soname_spec='${libname}${release}.so$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   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'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+