Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/
Date: Wed, 13 Feb 2019 20:43:30
Message-Id: 1550090575.6136f3c691e05e542e644be851bea9f035337fdd.gyakovlev@gentoo
1 commit: 6136f3c691e05e542e644be851bea9f035337fdd
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 13 20:42:17 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 13 20:42:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6136f3c6
7
8 dev-java/openjdk: die if FEATURES=ccache
9
10 ./configure will die anyway, so we die a bit earlier before unpacking.
11
12 openjdk wants to handle ccache itself and ignores portage or
13 system settings.
14
15 Bug: https://bugs.gentoo.org/677876
16 Package-Manager: Portage-2.3.60, Repoman-2.3.12
17 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
18
19 dev-java/openjdk/openjdk-11.0.1_p13.ebuild | 1 +
20 dev-java/openjdk/openjdk-11.0.2_p7.ebuild | 1 +
21 dev-java/openjdk/openjdk-8.202_p08.ebuild | 1 +
22 3 files changed, 3 insertions(+)
23
24 diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
25 index c16c9e8bb54..efa3a3ed2de 100644
26 --- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
27 +++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
28 @@ -95,6 +95,7 @@ openjdk_check_requirements() {
29
30 pkg_pretend() {
31 openjdk_check_requirements
32 + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
33 }
34
35 pkg_setup() {
36
37 diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
38 index f546f4783e3..1f86bff0e40 100644
39 --- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
40 +++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
41 @@ -73,6 +73,7 @@ openjdk_check_requirements() {
42
43 pkg_pretend() {
44 openjdk_check_requirements
45 + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
46 }
47
48 pkg_setup() {
49
50 diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild
51 index b0ad1d7bd36..fd7a5d675a4 100644
52 --- a/dev-java/openjdk/openjdk-8.202_p08.ebuild
53 +++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild
54 @@ -88,6 +88,7 @@ openjdk_check_requirements() {
55
56 pkg_pretend() {
57 openjdk_check_requirements
58 + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
59 }
60
61 pkg_setup() {