jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4 +++- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 1eae11e288b879e4b770fe714c3229fd3bd7d8ec Author: Damjan Jovanovic <[email protected]> AuthorDate: Sat Jul 27 19:55:19 2019 +0000 Commit: Damjan Jovanovic <[email protected]> CommitDate: Sat Jul 27 19:55:19 2019 +0000 Fix detection of Java versions > 1.8 Patch by: me diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 84dfedfaedd9..46456bc2be2b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems + "/lib/server/libjvm.so", // > 1.8 "/bin/classic/libjvm.so", // fallback for older for IBM Java "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java #endif @@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH + "/lib/" JFW_PLUGIN_ARCH, + "/lib" // > 1.8 #endif }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 2f636561ad07..a0ecb2508864 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", - "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" + "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", + "/lib/server/libjvm.so" // > 1.8 #endif }; *size = sizeof(ar) / sizeof (char*); @@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH + "/lib/" JFW_PLUGIN_ARCH, + "/lib" // > 1.8 }; *size = sizeof(ar) / sizeof (char*); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
