From 6136f3c691e05e542e644be851bea9f035337fdd Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Wed, 13 Feb 2019 12:42:17 -0800 Subject: [PATCH] dev-java/openjdk: die if FEATURES=ccache ./configure will die anyway, so we die a bit earlier before unpacking. openjdk wants to handle ccache itself and ignores portage or system settings. Bug: https://bugs.gentoo.org/677876 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev --- dev-java/openjdk/openjdk-11.0.1_p13.ebuild | 1 + dev-java/openjdk/openjdk-11.0.2_p7.ebuild | 1 + dev-java/openjdk/openjdk-8.202_p08.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild index c16c9e8bb540c..efa3a3ed2de56 100644 --- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild +++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild @@ -95,6 +95,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" } pkg_setup() { diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild index f546f4783e350..1f86bff0e40ac 100644 --- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild +++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild @@ -73,6 +73,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" } pkg_setup() { diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild index b0ad1d7bd36e3..fd7a5d675a455 100644 --- a/dev-java/openjdk/openjdk-8.202_p08.ebuild +++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild @@ -88,6 +88,7 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" } pkg_setup() {