| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: java-vm.mk,v 1.82 2011/11/26 18:25:43 ryoon Exp $ | | 1 | # $NetBSD: java-vm.mk,v 1.83 2012/05/12 21:07:28 marino Exp $ |
2 | # | | 2 | # |
3 | # This Makefile fragment handles Java dependencies and make variables, | | 3 | # This Makefile fragment handles Java dependencies and make variables, |
4 | # and is meant to be included by packages that require Java either at | | 4 | # and is meant to be included by packages that require Java either at |
5 | # build-time or at run-time. | | 5 | # build-time or at run-time. |
6 | # | | 6 | # |
7 | # User-settable variables: | | 7 | # User-settable variables: |
8 | # | | 8 | # |
9 | # PKG_JVM_DEFAULT | | 9 | # PKG_JVM_DEFAULT |
10 | # The JVM that should be used if nothing particular is specified. | | 10 | # The JVM that should be used if nothing particular is specified. |
11 | # | | 11 | # |
12 | # Possible values: kaffe openjdk7 openjdk7-bin | | 12 | # Possible values: kaffe openjdk7 openjdk7-bin |
13 | # sun-jdk6 jdk15 jdk16 | | 13 | # sun-jdk6 jdk15 jdk16 |
14 | # Default value: (platform-dependent) | | 14 | # Default value: (platform-dependent) |
| @@ -120,26 +120,27 @@ _ONLY_FOR_PLATFORMS.jdk16= \ | | | @@ -120,26 +120,27 @@ _ONLY_FOR_PLATFORMS.jdk16= \ |
120 | _ONLY_FOR_PLATFORMS.kaffe= \ | | 120 | _ONLY_FOR_PLATFORMS.kaffe= \ |
121 | *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc | | 121 | *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc |
122 | _ONLY_FOR_PLATFORMS.sun-jdk6= \ | | 122 | _ONLY_FOR_PLATFORMS.sun-jdk6= \ |
123 | Darwin-9.*-i386 Darwin-9.*-x86_64 \ | | 123 | Darwin-9.*-i386 Darwin-9.*-x86_64 \ |
124 | Darwin-10.*-i386 Darwin-10.*-x86_64 \ | | 124 | Darwin-10.*-i386 Darwin-10.*-x86_64 \ |
125 | Darwin-11.*-i386 Darwin-11.*-x86_64 \ | | 125 | Darwin-11.*-i386 Darwin-11.*-x86_64 \ |
126 | DragonFly-*-i386 \ | | 126 | DragonFly-*-i386 \ |
127 | FreeBSD-6.*-i386 \ | | 127 | FreeBSD-6.*-i386 \ |
128 | Linux-*-i[3-6]86 \ | | 128 | Linux-*-i[3-6]86 \ |
129 | Linux-*-x86_64 \ | | 129 | Linux-*-x86_64 \ |
130 | NetBSD-*-i386 NetBSD-*-x86_64 \ | | 130 | NetBSD-*-i386 NetBSD-*-x86_64 \ |
131 | SunOS-5.11-i386 | | 131 | SunOS-5.11-i386 |
132 | _ONLY_FOR_PLATFORMS.openjdk7= \ | | 132 | _ONLY_FOR_PLATFORMS.openjdk7= \ |
| | | 133 | DragonFly-*-* \ |
133 | NetBSD-[4-9]*-i386 \ | | 134 | NetBSD-[4-9]*-i386 \ |
134 | NetBSD-[5-9]*-x86_64 | | 135 | NetBSD-[5-9]*-x86_64 |
135 | _ONLY_FOR_PLATFORMS.openjdk7-bin= \ | | 136 | _ONLY_FOR_PLATFORMS.openjdk7-bin= \ |
136 | NetBSD-[5-9]*-i386 \ | | 137 | NetBSD-[5-9]*-i386 \ |
137 | NetBSD-[5-9]*-x86_64 | | 138 | NetBSD-[5-9]*-x86_64 |
138 | | | 139 | |
139 | # Set the accepted JVMs for this platform. | | 140 | # Set the accepted JVMs for this platform. |
140 | .for _jvm_ in ${_PKG_JVMS} | | 141 | .for _jvm_ in ${_PKG_JVMS} |
141 | . for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}} | | 142 | . for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}} |
142 | . if !empty(MACHINE_PLATFORM:M${_pattern_}) | | 143 | . if !empty(MACHINE_PLATFORM:M${_pattern_}) |
143 | _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} | | 144 | _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} |
144 | . endif | | 145 | . endif |
145 | . endfor | | 146 | . endfor |