|
Lines 135-142
Link Here
|
| 135 |
# to limit supported VM's for building and their preferred order |
135 |
# to limit supported VM's for building and their preferred order |
| 136 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
136 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
| 137 |
einfo "Honoring user-set JAVA_PKG_FORCE_VM" |
137 |
einfo "Honoring user-set JAVA_PKG_FORCE_VM" |
|
|
138 |
#elif has_version >dev-java/icedtea-7.1.14:7; then |
| 139 |
# JAVA_PKG_FORCE_VM="icedtea-7" |
| 138 |
#elif has_version dev-java/icedtea:7; then |
140 |
#elif has_version dev-java/icedtea:7; then |
| 139 |
# JAVA_PKG_FORCE_VM="icedtea7" |
141 |
# JAVA_PKG_FORCE_VM="icedtea7" |
|
|
142 |
#elif has_version dev-java/icedtea-bin:7; then |
| 143 |
# JAVA_PKG_FORCE_VM="icedtea-bin-7" |
| 144 |
elif has_version >dev-java/icedtea-6.1.10.3:6; then |
| 145 |
JAVA_PKG_FORCE_VM="icedtea-6" |
| 140 |
elif has_version dev-java/icedtea:6; then |
146 |
elif has_version dev-java/icedtea:6; then |
| 141 |
JAVA_PKG_FORCE_VM="icedtea6" |
147 |
JAVA_PKG_FORCE_VM="icedtea6" |
| 142 |
elif has_version dev-java/icedtea:0; then |
148 |
elif has_version dev-java/icedtea:0; then |
|
Lines 162-169
Link Here
|
| 162 |
java-vm-2_pkg_setup |
168 |
java-vm-2_pkg_setup |
| 163 |
java-pkg-2_pkg_setup |
169 |
java-pkg-2_pkg_setup |
| 164 |
fi |
170 |
fi |
| 165 |
|
|
|
| 166 |
VMHANDLE="icedtea${SLOT}" |
| 167 |
} |
171 |
} |
| 168 |
|
172 |
|
| 169 |
src_unpack() { |
173 |
src_unpack() { |
|
Lines 187-193
Link Here
|
| 187 |
local config procs rhino_jar |
191 |
local config procs rhino_jar |
| 188 |
local vm=$(java-pkg_get-current-vm) |
192 |
local vm=$(java-pkg_get-current-vm) |
| 189 |
|
193 |
|
| 190 |
if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea7" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then |
194 |
if has ${vm} icedtea-7 icedtea-bin-7 icedtea7 icedtea-6 icedtea6 icedtea6-bin icedtea; then |
| 191 |
# We can't currently bootstrap with a Sun-based JVM :( |
195 |
# We can't currently bootstrap with a Sun-based JVM :( |
| 192 |
config="${config} --disable-bootstrap" |
196 |
config="${config} --disable-bootstrap" |
| 193 |
elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" ]] ; then |
197 |
elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" ]] ; then |
