gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 06:37:10 -08:00
Code Issues Projects Releases Wiki Activity

dev-java/openjdk: move JDK_HOME definition to src_configure

Browse Source 
Avoids referencing WORKDIR from pkg_setup.

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
This commit is contained in:
Mike Gilbert
2022-07-04 03:44:30 -07:00
committed by Georgy Yakovlev
parent 88206c6e20
commit 8b4422f27c
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+5 -3
View File
@@ -143,9 +143,6 @@ pkg_setup() {
return
fi
done
else
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
fi
}
@@ -156,6 +153,11 @@ src_prepare() {
}
src_configure() {
if ! use system-bootstrap; then
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
fi
# Work around stack alignment issue, bug #647954.
use x86 && append-flags -mincoming-stack-boundary=2
dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+8 -8
View File
@@ -152,7 +152,15 @@ pkg_setup() {
return
fi
done
}
src_prepare() {
use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
default
chmod +x configure || die
}
src_configure() {
if has_version dev-java/openjdk:${SLOT}; then
export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
elif use !system-bootstrap ; then
@@ -165,15 +173,7 @@ pkg_setup() {
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
export JDK_HOME
fi
}
src_prepare() {
use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
default
chmod +x configure || die
}
src_configure() {
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2