Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3481
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3481/1
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)
---
M odk/settings/std.mk
1 file changed, 2 insertions(+), 0 deletions(-)
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 @@
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)
--
To view, visit https://gerrit.libreoffice.org/3481
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>
Context
- [PATCH libreoffice-3-6] fdo#63693 Do not force java -d32 for a 64-bit SDK · Stephan Bergmann (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.