diff options
| author | Harald Eilertsen <haraldei@FreeBSD.org> | 2026-05-05 11:26:36 +0000 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@FreeBSD.org> | 2026-05-07 09:12:10 +0000 |
| commit | 7878106082fd1f07814d754ef767c1f59168d1e9 (patch) | |
| tree | b48b26d6324baeede8dd425e63029618f68ba27f | |
| parent | 3221e20bcde55e4b8ee9f2e71096171ed9e8287f (diff) | |
java/javavmwrapper: JAVA_VERSION does not work with openjdk25
Remove the hard coded lists of java version numbers to iterate over when
JAVA_VERSION is set to N+. Instead use N as the lowest boundary, and the
latest available JDK as the upper bound, and just scan for the highest
available version satisfying the requirement.
Ideally it should be possible to deduce the upper bound from the
available java versions in ${PREFIX}/etc/javavms, but leaving that for
later.
Co-authored-by: jonc@chen.org.nz
PR: 293231
Reported by: jonc@chen.org.nz
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | java/javavmwrapper/Makefile | 2 | ||||
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 25 |
2 files changed, 6 insertions, 21 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index bafb9953bb2f..473b2dcfc559 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -1,6 +1,6 @@ PORTNAME= javavmwrapper PORTVERSION= 2.7.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index dce2cf38a194..8bb6a6c86b62 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -36,6 +36,8 @@ _JAVAVM_OPTS_CONF="${_JAVAVM_PREFIX}/etc/javavm_opts.conf" _JAVAVM_PROG=`basename "${0}"` _JAVAVM_MAKE=/usr/bin/make +_JAVAVM_LATEST_JDK="26" # update as required + # # Try to run a Java command. # @@ -503,26 +505,9 @@ setJavaHome() { _JAVAVM_VERSION= for version in ${JAVA_VERSION}; do case "${version}" in - 8+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 11 17 18 19 20 21" - ;; - 11+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 17 18 19 20 21" - ;; - 17+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 17 18 19 20 21" - ;; - 18+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 18 19 20 21" - ;; - 19+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 19 20 21" - ;; - 20+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 20 21" - ;; - 21+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 21" + *+) + version_base=$(echo $version | sed -e s/+$//) + _JAVAVM_VERSION="${_JAVAVM_VERSION} $(seq $version_base $_JAVAVM_LATEST_JDK)" ;; *) _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}" |