diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-06-20 11:59:20 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-06-20 11:59:20 +0000 |
| commit | ed1621bee80f719f46b18e767d88516cb41babac (patch) | |
| tree | 4703380cd5d7a1dfd31cab5252a5202f9294cda5 /mk | |
| parent | b88c31886120919ff4c7cbe766f7c4eaac4322f5 (diff) | |
| download | pkgsrc-ed1621bee80f719f46b18e767d88516cb41babac.tar.gz | |
Default to oracle-jdk8 on newer Darwin/x86_64.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 257d4ccc156..1b951550924 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.109 2017/05/10 14:04:31 ryoon Exp $ +# $NetBSD: java-vm.mk,v 1.110 2017/06/20 11:59:20 jperkin Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -103,7 +103,8 @@ _PKG_JVM_DEFAULT?= openjdk8 . elif !empty(MACHINE_PLATFORM:MNetBSD-[1234].*-i386) _PKG_JVM_DEFAULT?= sun-jdk6 . elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ - !empty(MACHINE_PLATFORM:MLinux-*-x86_64) + !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \ + !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64) _PKG_JVM_DEFAULT?= oracle-jdk8 . elif !empty(MACHINE_PLATFORM:MDarwin-*-*) _PKG_JVM_DEFAULT?= sun-jdk6 |