pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Default to oracle-jdk8 on newer Darwin/x86_64.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1b00ef07348
branches:  trunk
changeset: 364018:a1b00ef07348
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jun 20 11:59:20 2017 +0000

description:
Default to oracle-jdk8 on newer Darwin/x86_64.

diffstat:

 mk/java-vm.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 22d4efc33927 -r a1b00ef07348 mk/java-vm.mk
--- a/mk/java-vm.mk     Tue Jun 20 11:52:08 2017 +0000
+++ b/mk/java-vm.mk     Tue Jun 20 11:59:20 2017 +0000
@@ -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 @@
 .  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



Home | Main Index | Thread Index | Old Index