[patch] openjdk-ccache.patch

openjdk-ccache.patch (text/plain), 1.09 KB, created by Georgy Yakovlev on 2019-04-25 05:48:04 UTC

diff --git a/dev-java/openjdk/openjdk-11.0.3_p7.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
index 026d272de5e..37fa4201cee 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
@@ -73,7 +73,6 @@ openjdk_check_requirements() {
 
 pkg_pretend() {
 	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
 }
 
 pkg_setup() {
@@ -126,7 +125,6 @@ src_configure() {
 	# currently it still bundles lcms libpng giflib and libjpeg.
 
 	local myconf=(
-		--disable-ccache
 		--enable-full-docs=no
 		--with-boot-jdk="${JDK_HOME}"
 		--with-extra-cflags="${CFLAGS}"
@@ -153,10 +151,19 @@ src_configure() {
 		myconf+=( --disable-precompiled-headers )
 	fi
 
+	if has ccache ${FEATURES}; then
+		myconf+=( --enable-ccache )
+		myconf+=( --with-ccache-dir=${CCACHE_DIR} )
+	else
+		export CCACHE_DISABLE=1
+		myconf+=( --disable-ccache )
+	fi
+
 	(
 		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
+		PATH="${PATH/\/usr\/lib\/ccache\/bin\:/}" \
 		econf "${myconf[@]}"
 	)
 }