summaryrefslogtreecommitdiffstats
path: root/Repository.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-09-22 20:41:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-09-22 21:43:56 +0200
commit7db048f62929a9d267b63db3a6ea2b58b47ec757 (patch)
treefea8daeac65b52ab3e754ef59e99c38c01bb12a1 /Repository.mk
parentFix typos (diff)
downloadcore-7db048f62929a9d267b63db3a6ea2b58b47ec757.tar.gz
core-7db048f62929a9d267b63db3a6ea2b58b47ec757.zip
Manually select JDK outside /Library/Java/JavaVirtualMachines on macOS
32bc8ddbf335dd26019edcf12758643b4cff9913 "tdf#94716 allow Oracle's JDK to be used on OS X 10.10 and 10.11" had restricted both addJavaInfosDirScan (jvmfwk/plugins/sunmajor/pluginlib/util.cxx, relevant when LO scans for available Java runtimes) and JvmfwkUtil_isLoadableJVM (which is more central and also relevant when manually adding a Java installation on the Advanced options page) to JDK installations under /Library/Java/JavaVirtualMachines. Recent versions of OpenJDK for macOS are provided as *.tar.gz files (e.g., <https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL /openjdk-15_osx-x64_bin.tar.gz> avaiable at <http://jdk.java.net/15/>) that can potentially be installed anywhere, so it looks useful to remove the /Library/Java/JavaVirtualMachines restriction from JvmfwkUtil_isLoadableJVM. I'm not sure whether that would have any nagative impact, esp. for any scenario that would still be relevant today. When I unpacked the above openjdk-15_osx-x64_bin.tar.gz to ~/OpenJDK/ on my macOS 10.15.6, and manually added /Users/stephan/OpenJDK/jdk-15.jdk/Contents/Home on the Advanced options page, everything appeared to work fine. Change-Id: I15545cc786a4a423f3bfe22ba477a45d6ef7fdf1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103212 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Repository.mk')
0 files changed, 0 insertions, 0 deletions