1 |
commit: 663da9667916dbb60bdbca097e1b559d6b39bfa9 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 1 21:43:02 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 1 21:44:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663da966 |
7 |
|
8 |
dev-java/openjfx: fix installing without docs |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 14 ++++++++------ |
14 |
1 file changed, 8 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild |
17 |
index b22021a3d61..02d8964eaea 100644 |
18 |
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild |
19 |
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild |
20 |
@@ -173,13 +173,15 @@ src_configure() { |
21 |
#FIXME: should we enable webkit? doubt so |
22 |
|
23 |
# build is very sensetive to doc presense, take extra steps |
24 |
- local jdk_doc |
25 |
- if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then |
26 |
- jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" |
27 |
- elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then |
28 |
- jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" |
29 |
+ if use doc; then |
30 |
+ local jdk_doc |
31 |
+ if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then |
32 |
+ jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" |
33 |
+ elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then |
34 |
+ jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" |
35 |
+ fi |
36 |
+ [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" |
37 |
fi |
38 |
- [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" |
39 |
|
40 |
cat <<- _EOF_ > "${S}"/gradle.properties |
41 |
COMPILE_TARGETS = linux |