odk/settings/std.mk | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0d243a4452acc2a4672901e2782617b82aa135d4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Apr 19 09:26:53 2013 +0200
fdo#63693 Do not force java -d32 for a 64-bit SDK
The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not
catch
java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there "java -version"
outputs
"OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)" with "64-Bit" in the
second instead of the third field), so make it a bit more cheesy still
(i.e.,
just cover the case to not set -d32 for x86_64).
Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a
(cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8)
Reviewed-on: https://gerrit.libreoffice.org/3481
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 705b528..2a4cdd9 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -36,9 +36,11 @@ JAVA_OPTIONS=
ifneq "$(OO_SDK_JAVA_HOME)" ""
JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail
-1 | cut -d " " -f3)
ifeq "$(JAVA_BITS)" "64-Bit"
+ifneq "$(PROCTYPE)" "x86_64"
JAVA_OPTIONS=-d32
endif
endif
+endif
DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
