| 1 |
commit: 66e6e94d2da2ebb0b239a67895cc58f05a475d21 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 19:13:52 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 19:14:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e6e94d |
| 7 |
|
| 8 |
dev-java/openjdk: fix bootstrap logic err in 17 |
| 9 |
|
| 10 |
commit 5e22bb7a45589eb71e5f428c83ec1d0788b7c000 broke it. |
| 11 |
should have been applied only for 11 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/831574 |
| 14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 2 +- |
| 17 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 20 |
index c64d7b3baf67..cf327d5a4be5 100644 |
| 21 |
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 22 |
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 23 |
@@ -151,7 +151,7 @@ pkg_setup() { |
| 24 |
local xpakvar="${ARCH^^}_XPAK" |
| 25 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 26 |
else |
| 27 |
- if [[ ${MERGE_TYPE} == "binary" ]]; then |
| 28 |
+ if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 29 |
JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
| 30 |
[[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 31 |
JDK_HOME=${JDK_HOME#*/} |
Archives