Fix recording of dependencies to package.env when java-pkg_jar-from is called for...
authorPetteri Räty <betelgeuse@gentoo.org>
Thu, 1 Mar 2007 13:15:14 +0000 (13:15 +0000)
committerPetteri Räty <betelgeuse@gentoo.org>
Thu, 1 Mar 2007 13:15:14 +0000 (13:15 +0000)
eclass/java-utils-2.eclass

index c72de5ce8f4858ba03b0d4d7b57bb1272b1d87e9..7605aef6cd21d57b9f94253c2aabf950800849b0 100644 (file)
@@ -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}")