summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2022-01-20 11:13:52 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2022-01-20 11:14:48 -0800
commit66e6e94d2da2ebb0b239a67895cc58f05a475d21 (patch)
tree9099016a96b507bb713e5ad2920b5bc142a56d99
parentnet-firewall/iptables: revbump upstream double-free (bug #831626) (diff)
downloadgentoo-66e6e94d2da2ebb0b239a67895cc58f05a475d21.tar.gz
gentoo-66e6e94d2da2ebb0b239a67895cc58f05a475d21.tar.bz2
gentoo-66e6e94d2da2ebb0b239a67895cc58f05a475d21.zip
dev-java/openjdk: fix bootstrap logic err in 17
commit 5e22bb7a45589eb71e5f428c83ec1d0788b7c000 broke it. should have been applied only for 11 Closes: https://bugs.gentoo.org/831574 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--dev-java/openjdk/openjdk-17.0.2_p8.ebuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
index c64d7b3baf67..cf327d5a4be5 100644
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@@ -151,7 +151,7 @@ pkg_setup() {
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
else
- if [[ ${MERGE_TYPE} == "binary" ]]; then
+ 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#*/}