summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig>2007-02-22 23:52:58 +0000
committerrillig <rillig>2007-02-22 23:52:58 +0000
commit1a4d23f334c54bd237d834bc6dad683fe9182e5e (patch)
tree41273dfe5ed2fb4eec5516e481f83407967ec4c9 /mk
parentaf002df87d1fbdccbc0a02c9c9e59928b870a4d2 (diff)
downloadpkgsrc-1a4d23f334c54bd237d834bc6dad683fe9182e5e.tar.gz
Changed the default Java Virtual Machine for NetBSD and Linux from "jdk"
(JDK 1.1.8) to "sun-jdk" (any Sun JDK >= 1.2), since JDK 1.1.8 has been crashing for some NetBSD bulk builds for over a year now.
Diffstat (limited to 'mk')
-rw-r--r--mk/java-vm.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index f2f48a99d56..234200145cd 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.55 2007/02/18 19:12:07 tv Exp $
+# $NetBSD: java-vm.mk,v 1.56 2007/02/22 23:52:58 rillig Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -79,7 +79,7 @@ _PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT}
.if !defined(_PKG_JVM_DEFAULT)
. if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
!empty(MACHINE_PLATFORM:MLinux-*-i[3456]86)
-_PKG_JVM_DEFAULT?= jdk
+_PKG_JVM_DEFAULT?= sun-jdk
. elif !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
_PKG_JVM_DEFAULT?= blackdown-jdk13
. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)