CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Dec  2 10:57:50 UTC 2022

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

Log Message:
mk: Switch Darwin/Linux default to oracle-jdk17.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 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.131 pkgsrc/mk/java-vm.mk:1.132
--- pkgsrc/mk/java-vm.mk:1.131  Fri Dec  2 10:53:40 2022
+++ pkgsrc/mk/java-vm.mk        Fri Dec  2 10:57:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.131 2022/12/02 10:53:40 jperkin Exp $
+# $NetBSD: java-vm.mk,v 1.132 2022/12/02 10:57:50 jperkin Exp $
 #
 # This Makefile fragment provides a Java VM, either at build-time or at
 # run-time, depending on the package's needs.
@@ -120,9 +120,12 @@ _PKG_JVM_DEFAULT?= openjdk11
        !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \
        !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
 _PKG_JVM_DEFAULT?=     openjdk17
-.  elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
-        !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
-        !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64)
+.  elif ${MACHINE_PLATFORM:MLinux-*-aarch64} || \
+        ${MACHINE_PLATFORM:MLinux-*-x86_64} || \
+        ${MACHINE_PLATFORM:MDarwin-*-aarch64} || \
+        ${MACHINE_PLATFORM:MDarwin-*-x86_64}
+_PKG_JVM_DEFAULT?=     oracle-jdk17
+.  elif ${MACHINE_PLATFORM:MLinux-*-i[3456]86}
 _PKG_JVM_DEFAULT?=     oracle-jdk8
 .  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
 _PKG_JVM_DEFAULT?=     openjdk8