You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/08/05 16:27:36 UTC
[openoffice] 02/02: Fix detection of Java versions > 1.8
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO417
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9fbe0120861764e7e644476857de32c44186c400
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jul 27 19:55:19 2019 +0000
Fix detection of Java versions > 1.8
Patch by: me
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1863883 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 779db4a01a7b0297a1573645c842007eab71ab85)
---
main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4 +++-
main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index af4a782..a831585 100644
--- a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/main/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/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 4bfcd52..7809cb3 100644
--- a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/main/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*);