diff options
| author | jperkin <jperkin> | 2016-07-13 14:16:17 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-07-13 14:16:17 +0000 |
| commit | 47c5024252a62bfaf786d3eed64fb58ded0f9d86 (patch) | |
| tree | fba9ad3fb3b675396a05998751c595ec731fb08f /mk | |
| parent | 6ed00e2d4e0be24ed9158bd4472556583c70a85e (diff) | |
| download | pkgsrc-47c5024252a62bfaf786d3eed64fb58ded0f9d86.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.mk | 7 |
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 |