summaryrefslogtreecommitdiff
path: root/misc/openoffice3/patches/patch-cn
blob: f8b824c838de250bbe6e0224aeba09d6e2cf53ba (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
$NetBSD: patch-cn,v 1.2 2008/10/20 12:30:16 hira Exp $

--- desktop/scripts/soffice.sh.orig	2008-08-07 02:44:36.000000000 +0900
+++ desktop/scripts/soffice.sh	2008-10-19 14:38:10.000000000 +0900
@@ -49,6 +49,12 @@
     export JITC_PROCESSOR_TYPE
 fi
 
+# XXX: Ignore "unlocking unlocked mutex" error.
+if [ "`uname -s`" = "NetBSD" ]; then
+    PTHREAD_DIAGASSERT=AEL
+    export PTHREAD_DIAGASSERT
+fi
+
 # resolve installation directory
 sd_cwd="`pwd`"
 if [ -h "$0" ] ; then
@@ -64,6 +70,11 @@
 
 sd_binary=`basename "$0"`.bin
 
+if [ -z ${JAVA_HOME} ]; then
+	JAVA_HOME=@JAVA_HOME@
+	export JAVA_HOME
+fi
+
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
 for arg in $@