diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-06-15 09:46:01 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-06-15 09:46:01 +0000 |
| commit | fcc2032e34e9c298e220c78f4063d9c372dbcab8 (patch) | |
| tree | 65adeb92c85166b40532df26e61915d773d069d5 /mk | |
| parent | 270a529bb03deb593069f88ea1fd87e7bf29b269 (diff) | |
| download | pkgsrc-fcc2032e34e9c298e220c78f4063d9c372dbcab8.tar.gz | |
Add openjdk7 support for SunOS-5.11-*, make it the default for i386.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 3784a39fafd..c6ec86ab5f3 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.90 2012/12/11 14:54:00 ryoon Exp $ +# $NetBSD: java-vm.mk,v 1.91 2013/06/15 09:46:01 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,8 +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) || \ - !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?= sun-jdk6 . elif !empty(MACHINE_PLATFORM:MDragonFly-*-*) _PKG_JVM_DEFAULT?= openjdk7 @@ -138,7 +139,9 @@ _ONLY_FOR_PLATFORMS.sun-jdk6= \ _ONLY_FOR_PLATFORMS.openjdk7= \ DragonFly-*-* \ NetBSD-[4-9]*-i386 \ - NetBSD-[5-9]*-x86_64 + NetBSD-[5-9]*-x86_64 \ + SunOS-5.11-i386 \ + SunOS-5.11-x86_64 _ONLY_FOR_PLATFORMS.openjdk7-bin= \ NetBSD-[5-9]*-i386 \ NetBSD-[5-9]*-x86_64 |