| 1 |
commit: 02aaea3b49dc7bca0b192d0b56f803e11a9cb771 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 12 10:36:25 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 06:59:44 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02aaea3b |
| 7 |
|
| 8 |
dev-java/openjdk: improve MERGE_TYPE check in pkg_setup |
| 9 |
|
| 10 |
We can return early in pkg_setup if MERGE_TYPE=binary. |
| 11 |
|
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/25453 |
| 13 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild | 3 ++- |
| 16 |
dev-java/openjdk/openjdk-11.0.15_p10.ebuild | 3 ++- |
| 17 |
dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 14 +++++++------- |
| 18 |
dev-java/openjdk/openjdk-17.0.3_p7.ebuild | 14 +++++++------- |
| 19 |
4 files changed, 18 insertions(+), 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild |
| 22 |
index fa243d77955b..c9dc36e2d7bd 100644 |
| 23 |
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild |
| 24 |
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild |
| 25 |
@@ -130,6 +130,8 @@ pkg_setup() { |
| 26 |
openjdk_check_requirements |
| 27 |
java-vm-2_pkg_setup |
| 28 |
|
| 29 |
+ [[ ${MERGE_TYPE} == "binary" ]] && return |
| 30 |
+ |
| 31 |
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
| 32 |
JAVA_PKG_WANT_SOURCE="${SLOT}" |
| 33 |
JAVA_PKG_WANT_TARGET="${SLOT}" |
| 34 |
@@ -142,7 +144,6 @@ pkg_setup() { |
| 35 |
fi |
| 36 |
done |
| 37 |
else |
| 38 |
- [[ ${MERGE_TYPE} == "binary" ]] && return |
| 39 |
local xpakvar="${ARCH^^}_XPAK" |
| 40 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 41 |
fi |
| 42 |
|
| 43 |
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild |
| 44 |
index cb5035667c42..76cfa3954b7c 100644 |
| 45 |
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild |
| 46 |
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild |
| 47 |
@@ -130,6 +130,8 @@ pkg_setup() { |
| 48 |
openjdk_check_requirements |
| 49 |
java-vm-2_pkg_setup |
| 50 |
|
| 51 |
+ [[ ${MERGE_TYPE} == "binary" ]] && return |
| 52 |
+ |
| 53 |
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
| 54 |
JAVA_PKG_WANT_SOURCE="${SLOT}" |
| 55 |
JAVA_PKG_WANT_TARGET="${SLOT}" |
| 56 |
@@ -142,7 +144,6 @@ pkg_setup() { |
| 57 |
fi |
| 58 |
done |
| 59 |
else |
| 60 |
- [[ ${MERGE_TYPE} == "binary" ]] && return |
| 61 |
local xpakvar="${ARCH^^}_XPAK" |
| 62 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 63 |
fi |
| 64 |
|
| 65 |
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 66 |
index 501c0e15b4d2..1a4d2981a7fe 100644 |
| 67 |
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 68 |
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 69 |
@@ -128,6 +128,8 @@ pkg_setup() { |
| 70 |
openjdk_check_requirements |
| 71 |
java-vm-2_pkg_setup |
| 72 |
|
| 73 |
+ [[ ${MERGE_TYPE} == "binary" ]] && return |
| 74 |
+ |
| 75 |
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
| 76 |
JAVA_PKG_WANT_SOURCE="${SLOT}" |
| 77 |
JAVA_PKG_WANT_TARGET="${SLOT}" |
| 78 |
@@ -154,13 +156,11 @@ pkg_setup() { |
| 79 |
local xpakvar="${ARCH^^}_XPAK" |
| 80 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 81 |
else |
| 82 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 83 |
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) |
| 84 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 85 |
- JDK_HOME=${JDK_HOME#*/} |
| 86 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 87 |
- export JDK_HOME |
| 88 |
- fi |
| 89 |
+ JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) |
| 90 |
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 91 |
+ JDK_HOME=${JDK_HOME#*/} |
| 92 |
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 93 |
+ export JDK_HOME |
| 94 |
fi |
| 95 |
} |
| 96 |
|
| 97 |
|
| 98 |
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild |
| 99 |
index 5e8f8d958a2a..9868acbeda61 100644 |
| 100 |
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild |
| 101 |
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild |
| 102 |
@@ -128,6 +128,8 @@ pkg_setup() { |
| 103 |
openjdk_check_requirements |
| 104 |
java-vm-2_pkg_setup |
| 105 |
|
| 106 |
+ [[ ${MERGE_TYPE} == "binary" ]] && return |
| 107 |
+ |
| 108 |
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
| 109 |
JAVA_PKG_WANT_SOURCE="${SLOT}" |
| 110 |
JAVA_PKG_WANT_TARGET="${SLOT}" |
| 111 |
@@ -154,13 +156,11 @@ pkg_setup() { |
| 112 |
local xpakvar="${ARCH^^}_XPAK" |
| 113 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 114 |
else |
| 115 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 116 |
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) |
| 117 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 118 |
- JDK_HOME=${JDK_HOME#*/} |
| 119 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 120 |
- export JDK_HOME |
| 121 |
- fi |
| 122 |
+ JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) |
| 123 |
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 124 |
+ JDK_HOME=${JDK_HOME#*/} |
| 125 |
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 126 |
+ export JDK_HOME |
| 127 |
fi |
| 128 |
} |
Archives