diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-06-23 17:43:39 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-06-23 17:43:39 +0000 |
| commit | 3259c0a0860224167eb41ace5c384f88cf7fb9f9 (patch) | |
| tree | 1dfcebea95858b12d03daeb51d3f584a6ff7fe75 /mk | |
| parent | 9f46ff34435facffd4216e5bb64c46f2bbf7d7bb (diff) | |
| download | pkgsrc-3259c0a0860224167eb41ace5c384f88cf7fb9f9.tar.gz | |
Switch SunOS-5.11-x86_64 to openjdk7 by default.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index c6ec86ab5f3..4819970b7ee 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.91 2013/06/15 09:46:01 jperkin Exp $ +# $NetBSD: java-vm.mk,v 1.92 2013/06/23 17:43:39 jperkin Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -102,10 +102,9 @@ _PKG_JVM_DEFAULT?= openjdk7 _PKG_JVM_DEFAULT?= sun-jdk6 . elif !empty(MACHINE_PLATFORM:MDarwin-*-*) _PKG_JVM_DEFAULT?= sun-jdk6 -. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) +. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \ + !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64) _PKG_JVM_DEFAULT?= openjdk7 -. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64) -_PKG_JVM_DEFAULT?= sun-jdk6 . elif !empty(MACHINE_PLATFORM:MDragonFly-*-*) _PKG_JVM_DEFAULT?= openjdk7 . else |