Wed Jul 29 21:42:30 2020 UTC ()
Allow use of openjdk11 on NetBSD/aarch64.


(rjs)
diff -r1.120 -r1.121 pkgsrc/mk/java-vm.mk
cvs diff -r1.120 -r1.121 pkgsrc/mk/java-vm.mk (expand / switch to unified diff)

--- pkgsrc/mk/java-vm.mk 2020/05/17 00:54:00 1.120
+++ pkgsrc/mk/java-vm.mk 2020/07/29 21:42:30 1.121
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: java-vm.mk,v 1.120 2020/05/17 00:54:00 tnn Exp $ 1# $NetBSD: java-vm.mk,v 1.121 2020/07/29 21:42:30 rjs Exp $
2# 2#
3# This Makefile fragment handles Java dependencies and make variables, 3# This Makefile fragment handles Java dependencies and make variables,
4# and is meant to be included by packages that require Java either at 4# and is meant to be included by packages that require Java either at
5# build-time or at run-time. 5# build-time or at run-time.
6# 6#
7# User-settable variables: 7# User-settable variables:
8# 8#
9# PKG_JVM_DEFAULT 9# PKG_JVM_DEFAULT
10# The JVM that should be used if nothing particular is specified. 10# The JVM that should be used if nothing particular is specified.
11# 11#
12# Possible values: kaffe openjdk8 12# Possible values: kaffe openjdk8
13# sun-jdk7 oracle-jdk8 13# sun-jdk7 oracle-jdk8
14# adoptopenjdk11-bin 14# adoptopenjdk11-bin
@@ -156,27 +156,28 @@ _ONLY_FOR_PLATFORMS.oracle-jdk8= \ @@ -156,27 +156,28 @@ _ONLY_FOR_PLATFORMS.oracle-jdk8= \
156 FreeBSD-6.*-i386 \ 156 FreeBSD-6.*-i386 \
157 Linux-*-i[3-6]86 \ 157 Linux-*-i[3-6]86 \
158 Linux-*-x86_64 \ 158 Linux-*-x86_64 \
159 NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \ 159 NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
160 SunOS-5.11-x86_64 160 SunOS-5.11-x86_64
161_ONLY_FOR_PLATFORMS.adoptopenjdk11-bin= \ 161_ONLY_FOR_PLATFORMS.adoptopenjdk11-bin= \
162 Linux-*-x86_64 \ 162 Linux-*-x86_64 \
163 NetBSD-[6-9]*-x86_64 163 NetBSD-[6-9]*-x86_64
164_ONLY_FOR_PLATFORMS.openjdk-bin= \ 164_ONLY_FOR_PLATFORMS.openjdk-bin= \
165 Linux-*-x86_64 \ 165 Linux-*-x86_64 \
166 NetBSD-[6-9]*-x86_64 166 NetBSD-[6-9]*-x86_64
167_ONLY_FOR_PLATFORMS.openjdk11= \ 167_ONLY_FOR_PLATFORMS.openjdk11= \
168 NetBSD-[7-9]*-x86_64 \ 168 NetBSD-[7-9]*-x86_64 \
169 NetBSD-[7-9]*-i386 169 NetBSD-[7-9]*-i386 \
 170 NetBSD-*-aarch64
170 171
171# Set ONLY_FOR_PLATFORM based on accepted JVMs 172# Set ONLY_FOR_PLATFORM based on accepted JVMs
172.for _jvm_ in ${PKG_JVMS_ACCEPTED} 173.for _jvm_ in ${PKG_JVMS_ACCEPTED}
173ONLY_FOR_PLATFORM+= ${_ONLY_FOR_PLATFORMS.${_jvm_}} 174ONLY_FOR_PLATFORM+= ${_ONLY_FOR_PLATFORMS.${_jvm_}}
174.endfor 175.endfor
175 176
176# Set the accepted JVMs for this platform. 177# Set the accepted JVMs for this platform.
177.for _jvm_ in ${_PKG_JVMS} 178.for _jvm_ in ${_PKG_JVMS}
178. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}} 179. for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}}
179. if !empty(MACHINE_PLATFORM:M${_pattern_}) 180. if !empty(MACHINE_PLATFORM:M${_pattern_})
180_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} 181_PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}}
181. endif 182. endif
182. endfor 183. endfor