| 1 |
commit: 91385d013bd1fbc0c8a8e5bc5ec43d8e0f3906f5 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 11 04:42:25 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 11 04:42:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91385d01 |
| 7 |
|
| 8 |
dev-java/openjdk: don't die on ccache if binpkg is being used |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/677876 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-java/openjdk/openjdk-11.0.7_p10.ebuild | 4 +++- |
| 15 |
dev-java/openjdk/openjdk-8.252_p09.ebuild | 4 +++- |
| 16 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild |
| 19 |
index 76d41a4eb08..b5d448dd9e8 100644 |
| 20 |
--- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild |
| 21 |
+++ b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild |
| 22 |
@@ -96,7 +96,9 @@ openjdk_check_requirements() { |
| 23 |
|
| 24 |
pkg_pretend() { |
| 25 |
openjdk_check_requirements |
| 26 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
| 27 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 28 |
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
| 29 |
+ fi |
| 30 |
} |
| 31 |
|
| 32 |
pkg_setup() { |
| 33 |
|
| 34 |
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild |
| 35 |
index eb54f0c8ec2..1b3576eacaf 100644 |
| 36 |
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild |
| 37 |
+++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild |
| 38 |
@@ -95,7 +95,9 @@ openjdk_check_requirements() { |
| 39 |
|
| 40 |
pkg_pretend() { |
| 41 |
openjdk_check_requirements |
| 42 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
| 43 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 44 |
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
| 45 |
+ fi |
| 46 |
} |
| 47 |
|
| 48 |
pkg_setup() { |
Archives