diff options
| author | Ronald Klop <ronald@FreeBSD.org> | 2026-03-09 19:19:48 +0000 |
|---|---|---|
| committer | Ronald Klop <ronald@FreeBSD.org> | 2026-04-08 07:09:59 +0000 |
| commit | ea9b758b76fda040a56a4d48a161804c22b39214 (patch) | |
| tree | 9161634c07399cc00b9f46ba24d9d393d0c5ed2d | |
| parent | d1cd65d39dca2bfa2ab96938df1a5f8b54385a54 (diff) | |
Mk/Uses/java.mk: re-order preferred JDK (latest LTS over non-LTS)
Old order:
1. JAVA_DEFAULT
2. The oldest JDK in the JAVA_VERSION range.
New order:
1. JAVA_DEFAULT (unchanged)
2. The latest LTS from the JAVA_VERSION range is preferred over non-LTS versions.
Other existing mechanisms are unchanged. Like looking at what JDKs are already
installed.
This only affects 17 ports. (see the issue for the list)
PR: 293756
| -rw-r--r-- | Mk/Uses/java.mk | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk index cc2c7adba4bc..14e558c9380b 100644 --- a/Mk/Uses/java.mk +++ b/Mk/Uses/java.mk @@ -31,6 +31,10 @@ # port. An optional "+" allows you to specify a range of # versions. (allowed values: 8[+] 11[+] 17[+] # 21[+] 22[+] 23[+] 24[+] 25[+] 26[+]) +# JAVA_DEFAULT (Mk/bsd.default-versions.mk) is used if this +# variable is omitted or if JAVA_DEFAULT is part of the range. +# Otherwise the latest LTS from the range is preferred over +# non-LTS versions. # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -238,16 +242,20 @@ _JAVA_OS_native= Native _JAVA_OS_linux= Linux # List all JDK ports in order of preference -__JAVA_PORTS_ALL= \ - JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_17 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_22 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_23 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_24 \ +__JAVA_PORTS_NATIVE_LTS= \ JAVA_PORT_NATIVE_OPENJDK_JDK_25 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_17 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_8 +__JAVA_PORTS_NATIVE_NON_LTS= \ JAVA_PORT_NATIVE_OPENJDK_JDK_26 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_24 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_23 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_22 +__JAVA_PORTS_ALL= \ + ${__JAVA_PORTS_NATIVE_LTS} \ + ${__JAVA_PORTS_NATIVE_NON_LTS} \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \ @@ -258,7 +266,7 @@ _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ _JDK_FILE=bin/javac #------------------------------------------------------------------------------- -# Stage 2: Determine which JDK ports are suitable and which JDK ports are +# Stage 2: Determine which JDK ports are installed and which JDK ports are # suitable # |