diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-02-12 23:51:44 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-02-12 23:51:44 +0000 |
| commit | c1a228c5a0b46c69464d81c9f744a136f64ac165 (patch) | |
| tree | 8e341427116e47874b760d0edf78b9215af647b7 /eclass/java-ant-2.eclass | |
| parent | Do the same with 5.1.10, might help bug #292876 as well. (diff) | |
| download | gentoo-2-c1a228c5a0b46c69464d81c9f744a136f64ac165.tar.gz gentoo-2-c1a228c5a0b46c69464d81c9f744a136f64ac165.tar.bz2 gentoo-2-c1a228c5a0b46c69464d81c9f744a136f64ac165.zip | |
Add a separate java-pkg_get-bootclasspath function and make java-pkg_rewrite-bootclasspath use it.
Diffstat (limited to 'eclass/java-ant-2.eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index a3d1902eb002..a8be8b4f57e9 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -14,7 +14,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.47 2010/02/01 09:38:44 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.48 2010/02/12 23:51:44 caster Exp $ inherit java-utils-2 @@ -477,19 +477,8 @@ java-ant_rewrite-bootclasspath() { local extra_before="${3}" local extra_after="${4}" - local bcp - case "${version}" in - auto) - bcp="$(java-config -g BOOTCLASSPATH)" - ;; - 1.5) - bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)" - ;; - *) - eerror "unknown parameter of java-ant_rewrite-bootclasspath" - die "unknown parameter of java-ant_rewrite-bootclasspath" - ;; - esac + local bcp="$(java-pkg_get-bootclasspath "${version}")" + if [[ -n "${extra_before}" ]]; then bcp="${extra_before}:${bcp}" fi |