pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Switch SunOS-5.11-i386 default back to openjdk7. O...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7ffd2adaad2
branches:  trunk
changeset: 349632:f7ffd2adaad2
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jul 13 14:16:17 2016 +0000

description:
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:

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

diffs (21 lines):

diff -r 989b9ab7b840 -r f7ffd2adaad2 mk/java-vm.mk
--- a/mk/java-vm.mk     Wed Jul 13 13:36:01 2016 +0000
+++ b/mk/java-vm.mk     Wed Jul 13 14:16:17 2016 +0000
@@ -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?=     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



Home | Main Index | Thread Index | Old Index