diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2009-08-27 21:49:04 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2009-08-27 21:49:04 +0000 |
| commit | a9064aa3d8b2ef1065812f7f75e731b76da624fd (patch) | |
| tree | 281f4c61b0a5d008250fec4a7684171f7e9437c4 /eclass | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-a9064aa3d8b2ef1065812f7f75e731b76da624fd.tar.gz historical-a9064aa3d8b2ef1065812f7f75e731b76da624fd.tar.bz2 historical-a9064aa3d8b2ef1065812f7f75e731b76da624fd.zip | |
Suuport for multi-provider virtuals and build only vms
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-virtuals-2.eclass | 3 | ||||
| -rw-r--r-- | eclass/java-vm-2.eclass | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass index e4c04133b8cf..ed52a2b0d5db 100644 --- a/eclass/java-virtuals-2.eclass +++ b/eclass/java-virtuals-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.5 2009/02/05 00:32:39 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-virtuals-2.eclass,v 1.6 2009/08/27 21:49:04 ali_bush Exp $ # Original Author: Alistair John Bush <ali_bush@gentoo.org> # Purpose: To provide a default (and only) src_install function @@ -39,5 +39,6 @@ java-virtuals-2_do_write() { if [[ -n "${JAVA_VIRTUAL_VM_CLASSPATH}" ]]; then echo "VM_CLASSPATH=\"${JAVA_VIRTUAL_VM_CLASSPATH}\"" fi + echo "MULTI_PROVIDER=\"${JAVA_VIRTUAL_MULTI=FALSE}\"" } > "${JAVA_PKG_VIRTUAL_PROVIDER}" } diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 37fdfa991533..503973c2f335 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.27 2009/04/17 22:50:41 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.28 2009/08/27 21:49:04 ali_bush Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -24,6 +24,7 @@ export WANT_JAVA_CONFIG=2 JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm" JAVA_VM_DIR="/usr/lib/jvm" +JAVA_VM_BUILD_ONLY="${JAVA_VM_BUILD_ONLY:-FALSE}" EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm @@ -134,7 +135,10 @@ set_java_env() { < ${source_env_file} \ > ${env_file} || die "sed failed" - echo "VMHANDLE=\"${VMHANDLE}\"" >> ${env_file} + ( + echo "VMHANDLE=\"${VMHANDLE}\"" + echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" + ) >> ${env_file} [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file} |