diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild index c9dc36e2d7bd0..6ead864753512 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild @@ -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 diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild index aa78810445e07..d420e8418f314 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild @@ -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