CVS commit: pkgsrc/mk

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Apr  9 12:47:24 UTC 2021

Modified Files:
        pkgsrc/mk: java-vm.mk

Log Message:
mk/java-vm.mk: switch NetBSD-*-aarch64 to openjdk11


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/mk/java-vm.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/java-vm.mk
diff -u pkgsrc/mk/java-vm.mk:1.122 pkgsrc/mk/java-vm.mk:1.123
--- pkgsrc/mk/java-vm.mk:1.122  Mon Dec 14 16:51:16 2020
+++ pkgsrc/mk/java-vm.mk        Fri Apr  9 12:47:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.122 2020/12/14 16:51:16 abs Exp $
+# $NetBSD: java-vm.mk,v 1.123 2021/04/09 12:47:24 tnn Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -107,10 +107,10 @@ _PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT}
         !empty(MACHINE_PLATFORM:MNetBSD-[56].*-x86_64)
 _PKG_JVM_DEFAULT?=     openjdk8
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
-       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64)
+       !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \
+       !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
 _PKG_JVM_DEFAULT?=     openjdk11
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
-       !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || \
        !empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
 _PKG_JVM_DEFAULT?=     openjdk8
 .  elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \