diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 14:22:45 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-05-04 22:16:36 +0200 |
| commit | 958a0d618d78bf12d155aa5af9196757de26281b (patch) | |
| tree | fbc8b52c442e6b78b43b92cadf3cdbc328775d2a | |
| parent | 8a8226630e7e2458835f21f57cb73769ef06c668 (diff) | |
Some JREs need the bin/server/jvm.dll path after all
...which had been removed in 18bdf78e156f3cd1e6ccbb3ae28e919583bac70c "Azul is
just another OpenJDK variant", when fixing the previously mis-classified Azul
JRE from "uses OtherInfo" to "uses SunInfo". But the IBM Semeru Runtime
(<https://developer.ibm.com/languages/java/semeru-runtimes/downloads/>) is
another arguably mis-classified case due to its java.vendor of "IBM Corporation"
(and where the
VENDOR_MAP_ENTRY<OtherInfo>("IBM Corporation"),
line in jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx might be relevant for
some other JRE from IBM; at least, that entry is present ever since the
introduction of vendorlist.cxx in 738e9b77b9d181b376188e405e1eb353cf93c597
"INTEGRATION: CWS jl8").
So just generally support the bin/server/jvm.dll path here for "uses OtherInfo",
even though it should actually only be necessary for "uses SunInfo".
(See the mail thread starting at
<https://listarchives.libreoffice.org/global/users/2022/msg00246.html>
"[libreoffice-users] LibreOffice 7.3.3.2 Windows 64 bit seems not detect
AdoptOpenJdk JRE Windows 64 bit runtime".)
Change-Id: I3a4d02309b7c833c3cd32dc2dda4f4cb7b216693
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133827
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit c7b923a9ebaa40809c11659f8816a1d2bfd44c89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133733
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 578c51f0b0cc..528af9498959 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -52,7 +52,11 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", - "/bin/jrockit/jvm.dll" + "/bin/jrockit/jvm.dll", + // Needed by IBM Semeru Runtime, which is an OpenJDK (so should actually use SunInfo) with a + // java.vendor of "IBM Corporation", so using OtherInfo here (cf. gVendorMap in + // jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx): + "/bin/server/jvm.dll" #elif defined UNX #ifdef MACOSX "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 |