diff options
| author | abs <abs> | 2011-04-15 14:49:40 +0000 |
|---|---|---|
| committer | abs <abs> | 2011-04-15 14:49:40 +0000 |
| commit | 0277d42e13d4e39f3de31af94f2452fba0d299c1 (patch) | |
| tree | e2fd0544bfd2a7f75c19f3dfc7d8fab0fc3a2daf /mk/java-vm.mk | |
| parent | 8da414d2a2f661a4c939c6e8ca4a88527d53eab1 (diff) | |
| download | pkgsrc-0277d42e13d4e39f3de31af94f2452fba0d299c1.tar.gz | |
sun-j{re,dk} run fine on x86_64 Linux. They may install the 32 bit VM, but they run fine
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 20c7f324d72..504f46b61de 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.77 2011/01/08 16:44:10 wiz Exp $ +# $NetBSD: java-vm.mk,v 1.78 2011/04/15 14:49:40 abs Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -97,7 +97,8 @@ _PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64) _PKG_JVM_DEFAULT?= openjdk7 . elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ - !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) + !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ + !empty(MACHINE_PLATFORM:MLinux-*-x86_64) _PKG_JVM_DEFAULT?= sun-jdk6 . elif !empty(MACHINE_PLATFORM:MDarwin-*-*) _PKG_JVM_DEFAULT?= sun-jdk6 @@ -123,6 +124,7 @@ _ONLY_FOR_PLATFORMS.sun-jdk6= \ DragonFly-*-i386 \ FreeBSD-6.*-i386 \ Linux-*-i[3-6]86 \ + Linux-*-x86_64 \ NetBSD-*-i386 NetBSD-*-x86_64 \ SunOS-5.11-i386 _ONLY_FOR_PLATFORMS.openjdk7= \ |