| 1 |
commit: ffdb83c648b4e646d9b59ed4001d9133d2a5c491 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 26 17:18:47 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 4 10:44:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffdb83c6 |
| 7 |
|
| 8 |
dev-java/openjdk: use BROOT instead of EPREFIX where appropriate |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-java/openjdk/openjdk-11.0.15_p10.ebuild | 2 +- |
| 14 |
dev-java/openjdk/openjdk-17.0.3_p7.ebuild | 8 ++++---- |
| 15 |
dev-java/openjdk/openjdk-8.332_p09.ebuild | 2 +- |
| 16 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild |
| 19 |
index 6ead86475351..13011a1a1744 100644 |
| 20 |
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild |
| 21 |
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild |
| 22 |
@@ -138,7 +138,7 @@ pkg_setup() { |
| 23 |
|
| 24 |
if use system-bootstrap; then |
| 25 |
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
| 26 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
| 27 |
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then |
| 28 |
java-pkg-2_pkg_setup |
| 29 |
return |
| 30 |
fi |
| 31 |
|
| 32 |
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild |
| 33 |
index d420e8418f31..801109e4f4f2 100644 |
| 34 |
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild |
| 35 |
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild |
| 36 |
@@ -147,7 +147,7 @@ pkg_setup() { |
| 37 |
|
| 38 |
local vm |
| 39 |
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
| 40 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
| 41 |
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then |
| 42 |
java-pkg-2_pkg_setup |
| 43 |
return |
| 44 |
fi |
| 45 |
@@ -162,15 +162,15 @@ src_prepare() { |
| 46 |
|
| 47 |
src_configure() { |
| 48 |
if has_version dev-java/openjdk:${SLOT}; then |
| 49 |
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
| 50 |
+ export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} |
| 51 |
elif use !system-bootstrap ; then |
| 52 |
local xpakvar="${ARCH^^}_XPAK" |
| 53 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 54 |
else |
| 55 |
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) |
| 56 |
+ JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) |
| 57 |
[[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 58 |
JDK_HOME=${JDK_HOME#*/} |
| 59 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 60 |
+ JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*} |
| 61 |
export JDK_HOME |
| 62 |
fi |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild |
| 66 |
index 56ae18e26e00..a375e49ff167 100644 |
| 67 |
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild |
| 68 |
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild |
| 69 |
@@ -161,7 +161,7 @@ src_configure() { |
| 70 |
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS |
| 71 |
CFLAGS= CXXFLAGS= LDFLAGS= \ |
| 72 |
CONFIG_SITE=/dev/null \ |
| 73 |
- CONFIG_SHELL="${EPREFIX}/bin/bash" |
| 74 |
+ CONFIG_SHELL="${BROOT}/bin/bash" |
| 75 |
econf "${myconf[@]}" |
| 76 |
) |
| 77 |
} |
Archives