diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-28 15:35:43 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-09-01 16:17:23 +0200 |
commit | 63e158c66edf74d320fd05197779429efc964955 (patch) | |
tree | 34d8104b0833fdc84c53394bc802cb8ef6f63269 /svx | |
parent | dee0773acd8bf2c537e6574534824599f29feaab (diff) |
tdf#100501: Adapt to Java 9 (at least on Linux x86-64)
Checking with both jdk-9+181_linux-x64_bin.tar.gz and
jre-9+181_linux-x64_bin.tar.gz as currently available at
<http://jdk.java.net/9/> "JDK 9 Early-Access Builds":
For one, make SunVersion::init understand <http://openjdk.java.net/jeps/223>
"JEP 223: New Version-String Scheme" at least insofar as to accept strings like
"9" with less than three dot-separated segments (where the missing segments are
treated like "0").
For another, at least for Linux x86-64, libjvm.so is now apparently located in a
path without an "amd64" architecture segment, "lib/server/libjvm.so". (But
could that also be "client"?) Other platforms may need further adjustments.
(cherry picked from commit 52ffad9bb7be800790de6d918154dbeade88cadd, plus
cda4cea7cdfc9a8de814b901b3b957f029d36aaf "tdf#100501: Fix thinko")
Reviewed-on: https://gerrit.libreoffice.org/41678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit c83aec1d026b9567e7e6d982e4d19f3a566b66d2)
Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713
Reviewed-on: https://gerrit.libreoffice.org/41700
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit a2fb0739bd1a9823f9b52f8efabae0bcf9ff6b0c)
Diffstat (limited to 'svx')
0 files changed, 0 insertions, 0 deletions