| 1 |
commit: 5e22bb7a45589eb71e5f428c83ec1d0788b7c000 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 08:56:28 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 08:57:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e22bb7a |
| 7 |
|
| 8 |
dev-java/openjdk: fix logic in !system-bootstrap |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/openjdk/openjdk-11.0.14_p9.ebuild | 2 +- |
| 13 |
dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 2 +- |
| 14 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 17 |
index 452a5d1fe3b4..4e6f5d74d0bb 100644 |
| 18 |
--- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 19 |
+++ b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 20 |
@@ -138,7 +138,7 @@ pkg_setup() { |
| 21 |
fi |
| 22 |
done |
| 23 |
else |
| 24 |
- [[ ${MERGE_TYPE} != "binary" ]] && return |
| 25 |
+ [[ ${MERGE_TYPE} == "binary" ]] && return |
| 26 |
local xpakvar="${ARCH^^}_XPAK" |
| 27 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 28 |
fi |
| 29 |
|
| 30 |
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 31 |
index 1396149efca2..b1f71eb6dafc 100644 |
| 32 |
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 33 |
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 34 |
@@ -150,7 +150,7 @@ pkg_setup() { |
| 35 |
local xpakvar="${ARCH^^}_XPAK" |
| 36 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 37 |
else |
| 38 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 39 |
+ if [[ ${MERGE_TYPE} == "binary" ]]; then |
| 40 |
JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
| 41 |
[[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 42 |
JDK_HOME=${JDK_HOME#*/} |
Archives