71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
From b8dd74fa811af7a1a8cf7f93b49ed63c828232a8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Fri, 1 Mar 2024 07:31:27 +0100
|
|
Subject: [PATCH 1/2] Revert java 17 changes
|
|
|
|
---
|
|
README.md | 4 +++-
|
|
configure.ac | 10 +++++-----
|
|
2 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/README.md b/README.md
|
|
index f529e48d4714..6afb8000b0e1 100644
|
|
--- a/README.md
|
|
+++ b/README.md
|
|
@@ -57,7 +57,9 @@ Java is required for building many parts of LibreOffice. In TDF Wiki article
|
|
[Development/Java](https://wiki.documentfoundation.org/Development/Java), the
|
|
exact modules that depend on Java are listed.
|
|
|
|
-The baseline for Java is Java Development Kit (JDK) Version 17 or later.
|
|
+The baseline for Java is Java Development Kit (JDK) Version 17 or later. It is
|
|
+possible to build LibreOffice with JDK version 9, but it is no longer supported
|
|
+by the JDK vendors, thus it should be avoided.
|
|
|
|
If you want to use Clang with the LibreOffice compiler plugins, the minimal
|
|
version of Clang is 12.0.1. Since Xcode doesn't provide the compiler plugin
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ae808e69c5b0..932abe65b353 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2570,7 +2570,7 @@ AC_ARG_WITH(linker-hash-style,
|
|
|
|
AC_ARG_WITH(jdk-home,
|
|
AS_HELP_STRING([--with-jdk-home=<absolute path to JDK home>],
|
|
- [If you have installed JDK 17 or later on your system please supply the
|
|
+ [If you have installed JDK 9 or later on your system please supply the
|
|
path here. Note that this is not the location of the java command but the
|
|
location of the entire distribution. In case of cross-compiling, this
|
|
is the JDK of the host os. Use --with-build-platform-configure-options
|
|
@@ -8647,7 +8647,7 @@ if test "$ENABLE_JAVA" != ""; then
|
|
fi
|
|
|
|
if ! test -f "$with_jdk_home/lib/jvm.lib" -a -f "$with_jdk_home/bin/java.exe"; then
|
|
- AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 17])
|
|
+ AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 9])
|
|
fi
|
|
fi
|
|
|
|
@@ -8732,8 +8732,8 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
|
_jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//`
|
|
_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
|
|
|
|
- if test "$_jdk_ver" -lt 170000; then
|
|
- AC_MSG_ERROR([JDK is too old, you need at least 17 ($_jdk_ver < 170000)])
|
|
+ if test "$_jdk_ver" -lt 90000; then
|
|
+ AC_MSG_ERROR([JDK is too old, you need at least 9 ($_jdk_ver < 90000)])
|
|
fi
|
|
dnl TODO: Presumably, the Security Manager will not merely be disallowed, but be
|
|
dnl completely removed in some Java version > 18 (see
|
|
@@ -8754,7 +8754,7 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
|
JAVACFLAGS=-J-Xmx128M
|
|
fi
|
|
else
|
|
- AC_MSG_ERROR([Java not found. You need at least JDK 17])
|
|
+ AC_MSG_ERROR([Java not found. You need at least JDK 9])
|
|
fi
|
|
else
|
|
if test -z "$ENABLE_JAVA"; then
|
|
--
|
|
2.44.0
|
|
|