Tue May 24 09:46:05 2022 UTC ()
java-vm.mk: Use OPSYS_VERSION


(nia)
diff -r1.127 -r1.128 pkgsrc/mk/java-vm.mk
cvs diff -r1.127 -r1.128 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2022/05/13 14:28:29 1.127
+++ pkgsrc/mk/java-vm.mk 2022/05/24 09:46:05 1.128
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.127 2022/05/13 14:28:29 ryoon Exp $ 1# $NetBSD: java-vm.mk,v 1.128 2022/05/24 09:46:05 nia Exp $
2# 2#
3# This Makefile fragment provides a Java VM, either at build-time or at 3# This Makefile fragment provides a Java VM, either at build-time or at
4# run-time, depending on the package's needs. 4# run-time, depending on the package's needs.
5# 5#
6# User-settable variables: 6# User-settable variables:
7# 7#
8# PKG_JVM_DEFAULT 8# PKG_JVM_DEFAULT
9# The JVM that should be used if nothing particular is specified. 9# The JVM that should be used if nothing particular is specified.
10# 10#
11# Possible values: kaffe openjdk8 11# Possible values: kaffe openjdk8
12# sun-jdk7 oracle-jdk8 12# sun-jdk7 oracle-jdk8
13# adoptopenjdk11-bin 13# adoptopenjdk11-bin
14# openjdk-bin openjdk11 14# openjdk-bin openjdk11
@@ -97,28 +97,28 @@ _PKG_JVMS= ${_PKG_JVMS.${USE_JAVA2}} @@ -97,28 +97,28 @@ _PKG_JVMS= ${_PKG_JVMS.${USE_JAVA2}}
97. if !empty(PKG_JVM) 97. if !empty(PKG_JVM)
98_PKG_JVM_DEFAULT:= ${PKG_JVM} 98_PKG_JVM_DEFAULT:= ${PKG_JVM}
99. endif 99. endif
100.endif 100.endif
101 101
102# Set the default JVM for this platform. 102# Set the default JVM for this platform.
103# 103#
104.if !empty(PKG_JVM_DEFAULT) 104.if !empty(PKG_JVM_DEFAULT)
105_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} 105_PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT}
106.endif 106.endif
107.if !defined(_PKG_JVM_DEFAULT) 107.if !defined(_PKG_JVM_DEFAULT)
108. if !empty(MACHINE_PLATFORM:MNetBSD-[56].*-i386) || \ 108. if !empty(MACHINE_PLATFORM:MNetBSD-[56].*-i386) || \
109 !empty(MACHINE_PLATFORM:MNetBSD-[56].*-x86_64) || \ 109 !empty(MACHINE_PLATFORM:MNetBSD-[56].*-x86_64) || \
110 (!empty(MACHINE_PLATFORM:MNetBSD-9.*-aarch64) && \ 110 (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && \
111 empty(MACHINE_PLATFORM:MNetBSD-9.99.*-aarch64)) 111 ${OPSYS_VERSION} < 099900)
112_PKG_JVM_DEFAULT?= openjdk8 112_PKG_JVM_DEFAULT?= openjdk8
113. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 113. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
114 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || \ 114 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || \
115 !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) 115 !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
116_PKG_JVM_DEFAULT?= openjdk11 116_PKG_JVM_DEFAULT?= openjdk11
117. elif !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || \ 117. elif !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || \
118 !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) 118 !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf)
119_PKG_JVM_DEFAULT?= openjdk8 119_PKG_JVM_DEFAULT?= openjdk8
120. elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ 120. elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
121 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \ 121 !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
122 !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64) 122 !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64)
123_PKG_JVM_DEFAULT?= oracle-jdk8 123_PKG_JVM_DEFAULT?= oracle-jdk8
124. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) 124. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)