diff options
| author | abs <abs@pkgsrc.org> | 2003-05-09 11:31:46 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-05-09 11:31:46 +0000 |
| commit | 886543ff0caab8c02e6f2ff9328439145a6361c0 (patch) | |
| tree | bc1cf8522c5bc596c1a9cea8369e1d21d42672ad /mk | |
| parent | 7c24a873a0b525d16172af9daf721c9db5c0401f (diff) | |
| download | pkgsrc-886543ff0caab8c02e6f2ff9328439145a6361c0.tar.gz | |
sun-jdk defaults to sun-jdk14, but sun-jdk14 does not work reliably
on NetBSD/i386 1.6. I_believe_ it started working around the point
scheduler activations were imported, so give sun-jdk14 to 1.6M and
later, otherwise sun-jdk13.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index c6e1e75f904..81d3761b147 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.12 2003/03/23 17:30:39 jschauma Exp $ +# $NetBSD: java-vm.mk,v 1.13 2003/05/09 11:31:46 abs Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -124,8 +124,8 @@ _PKG_JVM_INSTALLED.${_jvm_}!= \ # or 1.4 version of the Sun JDK, so default to the newer installed one. # .if ${_PKG_JVM_DEFAULT} == "sun-jdk" -. if !empty(MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386) || \ - !empty(MACHINE_PLATFORM:MNetBSD-1.[6-9]*-i386) || \ +. if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*-i386) || \ + !empty(MACHINE_PLATFORM:MNetBSD-1.[7-9]*-i386) || \ !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) . if defined(_PKG_JVM_INSTALLED.sun-jdk14) && \ (${_PKG_JVM_INSTALLED.sun-jdk14} == "yes") |