From b0a566ddcfbfeb687b54c671dbc45729944292da Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henrich@debian.org> Date: Fri, 6 Oct 2023 16:07:24 +0000 Subject: [PATCH] Update file java_defaults.mk --- debian/java_defaults.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk index ea6ef07..2009657 100644 --- a/debian/java_defaults.mk +++ b/debian/java_defaults.mk @@ -6,6 +6,9 @@ java17_architectures = \ ia64 loong64 m68k mipsel mips64el \ powerpc ppc64 ppc64el \ riscv64 s390x sh4 sparc64 x32 +##FIXME not sure java21 arch list... +java21_architectures = $(java17_architectures) + java11_architectures = $(java17_architectures) \ mips java8_architectures = $(java11_architectures) @@ -19,7 +22,9 @@ java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architec _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH)) -ifneq (,$(filter $(_java_host_arch),$(java17_architectures))) +ifneq (,$(filter $(_java_host_arch),$(java21_architectures))) + java_default_version = 21 +else ifneq (,$(filter $(_java_host_arch),$(java17_architectures))) java_default_version = 17 else ifneq (,$(filter $(_java_host_arch),$(java11_architectures))) java_default_version = 11 @@ -30,7 +35,9 @@ endif # The minimum source/target compatibility level supported by the default JDK # This variable can be used by build scripts invoking directly javac with # the -source, -target or --release options. -ifneq (,$(filter $(_java_host_arch),$(java17_architectures))) +ifneq (,$(filter $(_java_host_arch),$(java21_architectures))) + java_compat_level = 8 +else ifneq (,$(filter $(_java_host_arch),$(java17_architectures))) java_compat_level = 7 else java_compat_level = 6 -- GitLab