summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam L. Thomson Jr <wlt@o-sinc.com>2016-09-09 19:22:45 -0400
committerJames Le Cuirot <chewi@gentoo.org>2016-10-17 16:15:12 +0100
commitf5ac6dc71047d73b74fdc6fd7fb9acff6a3a5031 (patch)
tree5fa60e17b662b21f7141852b4e8e72b37138e8b7
parentjava-utils-2.eclass: Added new function java-pkg_gen-cp (diff)
downloadgentoo-f5ac6dc71047d73b74fdc6fd7fb9acff6a3a5031.tar.gz
gentoo-f5ac6dc71047d73b74fdc6fd7fb9acff6a3a5031.tar.bz2
gentoo-f5ac6dc71047d73b74fdc6fd7fb9acff6a3a5031.zip
java-pkg-2.eclass: Implemented auto classpath
Added call to java-pkg_gen-cp EANT_GENTOO_CLASSPATH in java-pkg-2_src_compile. This has no effect unless CP_DEPEND is set in an ebuild. Closes: https://github.com/gentoo/gentoo/pull/2286 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
-rw-r--r--eclass/java-pkg-2.eclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 6b770663cd2f..8a657844fb07 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -76,6 +76,9 @@ java-pkg-2_src_prepare() {
java-pkg-2_src_compile() {
if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then
+ # auto generate classpath
+ java-pkg_gen-cp EANT_GENTOO_CLASSPATH
+
[[ "${EANT_FILTER_COMPILER}" ]] && \
java-pkg_filter-compiler ${EANT_FILTER_COMPILER}
local antflags="${EANT_BUILD_TARGET:=jar}"