| 1 |
commit: 3b1eccfee723451e2a4ef919e9414bb61446d417 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 06:45:33 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 07:23:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1eccfe |
| 7 |
|
| 8 |
dev-java/openjdk: get rid of gentoo-vm in openjdk-11.0.14_p9 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/810613 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-java/openjdk/openjdk-11.0.14_p9.ebuild | 40 ++++++++---------------------- |
| 14 |
1 file changed, 11 insertions(+), 29 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 17 |
index 7371e06cde2b..dc2c182e5e64 100644 |
| 18 |
--- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 19 |
+++ b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 20 |
@@ -42,7 +42,7 @@ SRC_URI=" |
| 21 |
LICENSE="GPL-2" |
| 22 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 23 |
|
| 24 |
-IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source system-bootstrap systemtap" |
| 25 |
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap pch selinux source system-bootstrap systemtap" |
| 26 |
|
| 27 |
COMMON_DEPEND=" |
| 28 |
media-libs/freetype:2= |
| 29 |
@@ -128,35 +128,17 @@ pkg_setup() { |
| 30 |
JAVA_PKG_WANT_SOURCE="${SLOT}" |
| 31 |
JAVA_PKG_WANT_TARGET="${SLOT}" |
| 32 |
|
| 33 |
- # The nastiness below is necessary while the gentoo-vm USE flag is |
| 34 |
- # masked. First we call java-pkg-2_pkg_setup if it looks like the |
| 35 |
- # flag was unmasked against one of the possible build VMs. If not, |
| 36 |
- # we try finding one of them in their expected locations. This would |
| 37 |
- # have been slightly less messy if openjdk-bin had been installed to |
| 38 |
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env |
| 39 |
- # file but disable it so that it would not normally be selectable. |
| 40 |
- |
| 41 |
- local vm |
| 42 |
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
| 43 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
| 44 |
- java-pkg-2_pkg_setup |
| 45 |
- return |
| 46 |
- fi |
| 47 |
- done |
| 48 |
- |
| 49 |
- if has_version --host-root dev-java/openjdk:${SLOT}; then |
| 50 |
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
| 51 |
- elif use !system-bootstrap ; then |
| 52 |
+ if use system-bootstrap; then |
| 53 |
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
| 54 |
+ if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
| 55 |
+ java-pkg-2_pkg_setup |
| 56 |
+ return |
| 57 |
+ fi |
| 58 |
+ done |
| 59 |
+ else |
| 60 |
+ [[ ${MERGE_TYPE} != "binary" ]] && return |
| 61 |
local xpakvar="${ARCH^^}_XPAK" |
| 62 |
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" |
| 63 |
- else |
| 64 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 65 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
| 66 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
| 67 |
- JDK_HOME=${JDK_HOME#*/} |
| 68 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 69 |
- export JDK_HOME |
| 70 |
- fi |
| 71 |
fi |
| 72 |
} |
| 73 |
|
| 74 |
@@ -291,7 +273,7 @@ src_install() { |
| 75 |
einfo "Creating the Class Data Sharing archives and disabling usage tracking" |
| 76 |
"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die |
| 77 |
|
| 78 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 79 |
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 80 |
java-vm_revdep-mask |
| 81 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
Archives