diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-03-01 13:15:14 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-03-01 13:15:14 +0000 |
| commit | db460581afdeeeba0f40dc9a41a7a94c60d89e5f (patch) | |
| tree | 7192e38f190ccd3da4f9e85b30f32e8fe8a9dbe1 /eclass | |
| parent | Remove trailing white space. (diff) | |
| download | gentoo-2-db460581afdeeeba0f40dc9a41a7a94c60d89e5f.tar.gz gentoo-2-db460581afdeeeba0f40dc9a41a7a94c60d89e5f.tar.bz2 gentoo-2-db460581afdeeeba0f40dc9a41a7a94c60d89e5f.zip | |
Fix recording of dependencies to package.env when java-pkg_jar-from is called for multiple packages using commas.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index c72de5ce8f48..7605aef6cd21 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.59 2007/03/01 12:53:38 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.60 2007/03/01 13:15:14 betelgeuse Exp $ # ----------------------------------------------------------------------------- @@ -816,6 +816,15 @@ java-pkg_jar-from() { pushd ${destdir} > /dev/null \ || die "failed to change directory to ${destdir}" + + # When we have commas this functions is called to bring jars from multiple + # packages. This affects recording of dependencencies because that syntax uses : + # if we don't change them to : gjl and java-config -d -p break + if [[ ${target_pkg} = *,* ]]; then + build_only="true" + java-pkg_record-jar_ ${target_pkg//,/:} + fi + local jar for jar in ${classpath//:/ }; do local jar_name=$(basename "${jar}") |