configure.ac | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
New commits: commit 26452c5c22e564323a819566e72ee444034a7b33 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Apr 24 09:05:09 2019 +0200 Commit: Aron Budea <[email protected]> CommitDate: Fri May 31 17:10:40 2024 +0200 Allow to pass JAVA_SOURCE/TARGET_VER into configure ...for those who pretend they know what they are doing (e.g., to experiment with building against Java 12 which no longer supports Java 1.6 source/target, even though that results in a build that is not baseline compatible). Change-Id: I6e8617bc5b90212473652bdfac40bb48e9623a08 Reviewed-on: https://gerrit.libreoffice.org/71218 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit d365f36331874f94bbd9832fbd19ace90fafefec) diff --git a/configure.ac b/configure.ac index 71022b841c46..7c9c698c843b 100644 --- a/configure.ac +++ b/configure.ac @@ -7010,8 +7010,8 @@ dnl Checks for javac dnl =================================================================== if test "$ENABLE_JAVA" != ""; then javacompiler="javac" - JAVA_SOURCE_VER="1.6" - JAVA_TARGET_VER="1.6" + : ${JAVA_SOURCE_VER=1.6} + : ${JAVA_TARGET_VER=1.6} if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVACOMPILER, $javacompiler) else commit 389d5165bd86119f81f43684d3bd4958d072a396 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Tue Feb 5 09:37:46 2019 +0100 Commit: Aron Budea <[email protected]> CommitDate: Fri May 31 17:10:29 2024 +0200 Always set java bytecode / source target to 1.6 / 6 as our new baseline (as discussed in ESC call 2019-02-07) Change-Id: I8a22fab6a1f9a713cb55b4c5d8173c3bbcd28587 Reviewed-on: https://gerrit.libreoffice.org/67387 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 204c5d1746c0afc145f9b54b68c4a099f9f0e2bf) diff --git a/configure.ac b/configure.ac index 05ecb1bae5e3..71022b841c46 100644 --- a/configure.ac +++ b/configure.ac @@ -6933,7 +6933,6 @@ if test "$ENABLE_JAVA" != ""; then fi fi -HAVE_JAVA9= dnl =================================================================== dnl Checks for JDK. dnl =================================================================== @@ -6985,9 +6984,6 @@ you must use the "--with-jdk-home" configure option explicitly]) if test "$_jdk_ver" -gt 10600; then JAVA_CLASSPATH_NOT_SET=TRUE fi - if test "$_jdk_ver" -ge 10900; then - HAVE_JAVA9=TRUE - fi AC_MSG_RESULT([checked (JDK $_jdk)]) JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` @@ -7009,24 +7005,13 @@ else export JAVA_HOME fi -dnl =================================================================== -dnl Set target Java bytecode version -dnl =================================================================== -if test "$ENABLE_JAVA" != ""; then - if test "$HAVE_JAVA9" = "TRUE"; then - _java_target_ver="1.6" - else - _java_target_ver="1.5" - fi - JAVA_SOURCE_VER="$_java_target_ver" - JAVA_TARGET_VER="$_java_target_ver" -fi - dnl =================================================================== dnl Checks for javac dnl =================================================================== if test "$ENABLE_JAVA" != ""; then javacompiler="javac" + JAVA_SOURCE_VER="1.6" + JAVA_TARGET_VER="1.6" if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVACOMPILER, $javacompiler) else
