diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index cf4273520a53..4b0646fed412 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1215,6 +1215,11 @@ eant() { antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" fi fi + + if is-java-strict; then + einfo "Disabling system classpath for ant" + antflags="${antflags} -Dbuild.sysclasspath=ignore" + fi if [[ -n ${JAVA_PKG_DEBUG} ]]; then antflags="${antflags} -debug" @@ -1785,8 +1790,7 @@ java-pkg_verify-classes() { java-pkg_check-phase() { local phase=${1} local funcname=${2} - # TODO add check for java-stricter - if [[ ${EBUILD_PHASE} != ${phase} ]]; then + if is-java-strict && [[ ${EBUILD_PHASE} != ${phase} ]]; then java-pkg_announce-qa-violation \ "${funcname} used outside of src_${phase}" fi @@ -1807,7 +1811,7 @@ java-pkg_check-jikes() { } java-pkg_announce-qa-violation() { - if hasq java-strict ${FEATURES}; then + if is-java-strict; then echo "Java QA Notice: $@" >&2 increment-qa-violations fi @@ -1818,6 +1822,11 @@ increment-qa-violations() { export JAVA_PKG_QA_VIOLATIONS } +is-java-strict() { + hasq java-strict ${FEATURES}; + return $? +} + # ------------------------------------------------------------------------------ # @eclass-end # ------------------------------------------------------------------------------ |