diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-05-31 11:40:08 -0700 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-05-31 11:44:27 -0700 |
| commit | 284b1f61cff4b549ab177d03c3bea3553b20ec62 (patch) | |
| tree | b172ba7285861bafbacb11769af3fd62ec2dc574 /dev-java/openjdk | |
| parent | dev-ada/aws: enable build with gnat-gpl-2019 (diff) | |
| download | gentoo-284b1f61cff4b549ab177d03c3bea3553b20ec62.tar.gz gentoo-284b1f61cff4b549ab177d03c3bea3553b20ec62.tar.bz2 gentoo-284b1f61cff4b549ab177d03c3bea3553b20ec62.zip | |
dev-java/openjdk: don't die on binpkg installation if no jvm on host
Bug: https://bugs.gentoo.org/687040
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-java/openjdk')
| -rw-r--r-- | dev-java/openjdk/openjdk-8.212_p03-r3.ebuild | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild index b10d08e19c72..2f13332849d1 100644 --- a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild +++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild @@ -122,11 +122,13 @@ pkg_setup() { if has_version --host-root dev-java/openjdk:${SLOT}; then export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} else - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME + if [[ ${MERGE_TYPE} != "binary" ]]; then + JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + export JDK_HOME + fi fi } |