diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2008-12-29 00:16:40 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2008-12-29 00:16:40 +0000 |
| commit | b822e8eaca527ff3bd17a452241efd26678728f5 (patch) | |
| tree | 254a179b3ecf75aea98b8a06797cab8c5c56ab50 /eclass/java-utils-2.eclass | |
| parent | Version bump, with patch from 249953 (diff) | |
| download | gentoo-2-b822e8eaca527ff3bd17a452241efd26678728f5.tar.gz gentoo-2-b822e8eaca527ff3bd17a452241efd26678728f5.tar.bz2 gentoo-2-b822e8eaca527ff3bd17a452241efd26678728f5.zip | |
Add EANT_NEEDS_TOOLS variable for adding tools.jar to gentoo.classpath, bug #231673 by James Le Cuirot <chewi@aura-online.co.uk>.
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 1cbab56469f5..82a7ec645e37 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.119 2008/12/20 19:25:29 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.120 2008/12/29 00:16:40 caster Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -1838,6 +1838,9 @@ java-utils-2_src_prepare() { # EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the # gentoo.classpath property. Be sure to call # java-ant_rewrite-classpath in src_unpack. +# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used +# for build-time purposes, the dependency is not recorded to +# package.env! # JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files # *ANT_TASKS - used to determine ANT_TASKS before calling Ant. # ------------------------------------------------------------------------------ @@ -1942,6 +1945,8 @@ eant() { cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})" done + [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)" + if [[ ${cp} ]]; then # It seems ant does not like single quotes around ${cp} cp=${cp#:} |