From: William L. Thomson Jr <wlt@o-sinc.com>
Date: Fri, 9 Sep 2016 23:22:45 +0000 (-0400)
Subject: java-pkg-2.eclass: Implemented auto classpath
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f5ac6dc71047d73b74fdc6fd7fb9acff6a3a5031;p=gentoo.git

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>
---

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}"