diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-02-15 01:24:59 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-02-15 01:24:59 +0000 |
| commit | c9ec1d735c57685687e1549a97269a7d5c0b6c72 (patch) | |
| tree | 49c1dda73b2ab3928619e05ddfb4826db0ba2f92 /eclass/java-ant-2.eclass | |
| parent | Fix compilation with gcc-4.3, bug 251252. Thanks to Gene Seto <geneseto@hotma... (diff) | |
| download | gentoo-2-c9ec1d735c57685687e1549a97269a7d5c0b6c72.tar.gz gentoo-2-c9ec1d735c57685687e1549a97269a7d5c0b6c72.tar.bz2 gentoo-2-c9ec1d735c57685687e1549a97269a7d5c0b6c72.zip | |
Make rewriter3 respect JAVA_ANT_CLASSPATH_TAGS
Diffstat (limited to 'eclass/java-ant-2.eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 0c0b3e2596ef..376e52f83f90 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.44 2009/02/08 15:50:21 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.45 2009/02/15 01:24:59 betelgeuse Exp $ inherit java-utils-2 @@ -307,7 +307,8 @@ java-ant_bsfix_files() { local bsfix_extra_args="" # WARNING KEEP THE ORDER, ESPECIALLY FOR CHANGED ATTRIBUTES! if [[ -n ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then - bsfix_extra_args="${bsfix_extra_args} -g -e javac -e xjavac " + local cp_tags="${JAVA_ANT_CLASSPATH_TAGS// / -e }" + bsfix_extra_args="${bsfix_extra_args} -g -e ${cp_tags}" bsfix_extra_args="${bsfix_extra_args} -a classpath -v '\${gentoo.classpath}'" fi if [[ -n ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]]; then @@ -347,6 +348,8 @@ java-ant_bsfix_files() { [[ -n ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ && bsfix_extra_args="${bsfix_extra_args} ${JAVA_ANT_BSFIX_EXTRA_ARGS}" + debug-print "bsfix_extra_args: ${bsfix_extra_args}" + eval ${rewriter3} ${files} \ -c --source-element ${JAVA_PKG_BSFIX_SOURCE_TAGS// / --source-element } \ --source-attribute source --source-value ${want_source} \ |