gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/openjdk: use BROOT instead of EPREFIX where appropriate

Browse Source 
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
This commit is contained in:
Mike Gilbert
2022-06-26 13:18:47 -04:00
committed by Georgy Yakovlev
parent 8b4422f27c
commit ffdb83c648
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-java/openjdk/openjdk-11.0.15_p10.ebuild
View File

@@ -138,7 +138,7 @@ pkg_setup() {
if use system-bootstrap; then
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
java-pkg-2_pkg_setup
return
fi

8
dev-java/openjdk/openjdk-17.0.3_p7.ebuild
View File

@@ -147,7 +147,7 @@ pkg_setup() {
local vm
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
java-pkg-2_pkg_setup
return
fi
@@ -162,15 +162,15 @@ src_prepare() {
src_configure() {
if has_version dev-java/openjdk:${SLOT}; then
export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
elif use !system-bootstrap ; then
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
else
JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
JDK_HOME=${JDK_HOME#*/}
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
export JDK_HOME
fi

2
dev-java/openjdk/openjdk-8.332_p09.ebuild
View File

@@ -161,7 +161,7 @@ src_configure() {
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
CONFIG_SITE=/dev/null \
CONFIG_SHELL="${EPREFIX}/bin/bash"
CONFIG_SHELL="${BROOT}/bin/bash"
econf "${myconf[@]}"
)
}