1 |
commit: 284b1f61cff4b549ab177d03c3bea3553b20ec62 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 31 18:40:08 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 31 18:44:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284b1f61 |
7 |
|
8 |
dev-java/openjdk: don't die on binpkg installation if no jvm on host |
9 |
|
10 |
Bug: https://bugs.gentoo.org/687040 |
11 |
|
12 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
14 |
|
15 |
dev-java/openjdk/openjdk-8.212_p03-r3.ebuild | 12 +++++++----- |
16 |
1 file changed, 7 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild |
19 |
index b10d08e19c7..2f13332849d 100644 |
20 |
--- a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild |
21 |
+++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild |
22 |
@@ -122,11 +122,13 @@ pkg_setup() { |
23 |
if has_version --host-root dev-java/openjdk:${SLOT}; then |
24 |
export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
25 |
else |
26 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
27 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
28 |
- JDK_HOME=${JDK_HOME#*/} |
29 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
30 |
- export JDK_HOME |
31 |
+ if [[ ${MERGE_TYPE} != "binary" ]]; then |
32 |
+ JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
33 |
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
34 |
+ JDK_HOME=${JDK_HOME#*/} |
35 |
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
36 |
+ export JDK_HOME |
37 |
+ fi |
38 |
fi |
39 |
} |