summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2016-07-13 14:16:17 +0000
committerjperkin <jperkin@pkgsrc.org>2016-07-13 14:16:17 +0000
commite51a27a08ff8a3d46ad4aafee0c569197cf80644 (patch)
tree669fda7e152a28b2949f61b46d117994cc524dfc /mk
parentf58dcee7069f1b3898573601b7d8132ab563eeac (diff)
downloadpkgsrc-e51a27a08ff8a3d46ad4aafee0c569197cf80644.tar.gz
Switch SunOS-5.11-i386 default back to openjdk7. Oracle have broken 32-bit
support in openjdk8 and have no intention of fixing it.
Diffstat (limited to 'mk')
-rw-r--r--mk/java-vm.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 3a595e07d41..531a86f025a 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.106 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: java-vm.mk,v 1.107 2016/07/13 14:16:17 jperkin Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -107,8 +107,9 @@ _PKG_JVM_DEFAULT?= sun-jdk6
_PKG_JVM_DEFAULT?= oracle-jdk8
. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
_PKG_JVM_DEFAULT?= sun-jdk6
-. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \
- !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
+. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
+_PKG_JVM_DEFAULT?= openjdk7
+. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
_PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
_PKG_JVM_DEFAULT?= openjdk8