diff options
| author |   Florian Schmaus <flow@gentoo.org> | 2022-05-12 12:36:25 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2022-05-13 08:59:44 +0200 |
| commit | 02aaea3b49dc7bca0b192d0b56f803e11a9cb771 (patch) | |
| tree | 2b6a23bcaa04c78f6479b8a5bc70f327ffb1ec23 /dev-java | |
| parent | dev-java/openjdk-bin: use SLOT=$(ver_cut 1) everywhere (diff) | |
| download | gentoo-02aaea3b49dc7bca0b192d0b56f803e11a9cb771.tar.gz gentoo-02aaea3b49dc7bca0b192d0b56f803e11a9cb771.tar.bz2 gentoo-02aaea3b49dc7bca0b192d0b56f803e11a9cb771.zip | |
dev-java/openjdk: improve MERGE_TYPE check in pkg_setup
We can return early in pkg_setup if MERGE_TYPE=binary.
Closes: https://github.com/gentoo/gentoo/pull/25453
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-11.0.15_p10.ebuild | 3 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 14 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-17.0.3_p7.ebuild | 14 |
4 files changed, 18 insertions, 16 deletions
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild index fa243d77955b..c9dc36e2d7bd 100644 --- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild @@ -130,6 +130,8 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -142,7 +144,6 @@ pkg_setup() { fi done else - [[ ${MERGE_TYPE} == "binary" ]] && return local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" fi diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild index cb5035667c42..76cfa3954b7c 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild @@ -130,6 +130,8 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -142,7 +144,6 @@ pkg_setup() { fi done else - [[ ${MERGE_TYPE} == "binary" ]] && return local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" fi diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild index 501c0e15b4d2..1a4d2981a7fe 100644 --- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild @@ -128,6 +128,8 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -154,13 +156,11 @@ pkg_setup() { local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version 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 + JDK_HOME=$(best_version 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 } diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild index 5e8f8d958a2a..9868acbeda61 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild @@ -128,6 +128,8 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -154,13 +156,11 @@ pkg_setup() { local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version 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 + JDK_HOME=$(best_version 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 } |