From 51d82565fd24eb24ee71248b091a6bdc1b0d0c89 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Fri, 31 May 2019 11:41:15 -0700 Subject: dev-java/openjdk: don't die on binpkg installation if no jvm on host Closes: https://bugs.gentoo.org/687040 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Georgy Yakovlev --- dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'dev-java') diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild index 960d7ca146c6..3a4668d70da8 100644 --- a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild +++ b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild @@ -115,11 +115,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 } -- cgit v1.2.3-65-gdbad