summaryrefslogtreecommitdiff
path: root/misc/openoffice/patches/patch-aa
blob: e9f6dbaa15dac10a1fed49b87150a54ec9f8fcf9 (plain)
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
$NetBSD: patch-aa,v 1.1.1.1 2002/02/13 18:09:22 mrauch Exp $

--- ../berkeleydb/db-3.2.9.patch.orig	Mon Jun 11 14:09:22 2001
+++ ../berkeleydb/db-3.2.9.patch
@@ -43,3 +43,39 @@
   
   CC=		@MAKEFILE_CC@
   CCLINK=		@MAKEFILE_CCLINK@
+--- 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
+@@ -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,7 @@
+ 	case "$host_os" in
+ 	solaris*)	JINCSUBDIRS="solaris";;
+ 	linux*)		JINCSUBDIRS="linux genunix";;
++	netbsd*)	JINCSUBDIRS="netbsd solaris linux genunix";;
+ 	*)		JINCSUBDIRS="genunix";;
+ 	esac
+ 
+--- 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 @@
+ 
+   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
+     ;;
+