diff options
| -rw-r--r-- | dev-java/openjdk-loom/files/openjdk.env.sh (renamed from dev-java/openjdk-loom/files/openjdk-loom-19.env.sh) | 3 | ||||
| -rw-r--r-- | dev-java/openjdk-loom/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild (renamed from dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild) | 52 |
3 files changed, 20 insertions, 36 deletions
diff --git a/dev-java/openjdk-loom/files/openjdk-loom-19.env.sh b/dev-java/openjdk-loom/files/openjdk.env.sh index 7db6461b..287c0578 100644 --- a/dev-java/openjdk-loom/files/openjdk-loom-19.env.sh +++ b/dev-java/openjdk-loom/files/openjdk.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk-loom/metadata.xml b/dev-java/openjdk-loom/metadata.xml index e53a64e3..e545984a 100644 --- a/dev-java/openjdk-loom/metadata.xml +++ b/dev-java/openjdk-loom/metadata.xml @@ -19,7 +19,6 @@ </slots> <use> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="javafx" restrict="<=dev-java/openjdk-9">Provide JavaFX support via <pkg>dev-java/openjfx</pkg></flag> <flag name="javafx" restrict=">=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag> <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> diff --git a/dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild b/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild index 245c7bcd..01de88c6 100644 --- a/dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild +++ b/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild @@ -9,14 +9,14 @@ MY_PV="${PV//_p/+}" SLOT="$(ver_cut 1)" DESCRIPTION="Experimental OpenJDK with Project Loom (Fibers / Virtual Threads)" -HOMEPAGE="https://openjdk.java.net" +HOMEPAGE="https://openjdk.org" EGIT_REPO_URI="https://github.com/openjdk/loom.git" -EGIT_COMMIT="6520b71a62baf64d214ff94c9291bfc513dfbe51" +EGIT_COMMIT="4047afb36f33b9dfc537be2047869a3f7940654e" LICENSE="GPL-2" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx jbootstrap selinux source +system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt javafx jbootstrap selinux source +system-bootstrap systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -30,7 +30,7 @@ COMMON_DEPEND=" media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib - virtual/jpeg:0= + media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) " @@ -69,8 +69,8 @@ DEPEND=" javafx? ( dev-java/openjfx:${SLOT}= ) system-bootstrap? ( || ( - dev-java/openjdk-bin:18 - dev-java/openjdk:18 + dev-java/openjdk-bin:20 + dev-java/openjdk:20 dev-java/openjdk-bin:${SLOT} dev-java/openjdk:${SLOT} ) @@ -103,7 +103,7 @@ pkg_setup() { [[ ${MERGE_TYPE} == "binary" ]] && return - JAVA_PKG_WANT_BUILD_VM="openjdk-18 openjdk-bin-18 openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_BUILD_VM="openjdk-20 openjdk-bin-20 openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -117,32 +117,32 @@ 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 done +} +src_prepare() { + default + chmod +x configure || die +} + +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 -} -src_prepare() { - 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 @@ -252,7 +252,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # must be done before running itself java-vm_set-pax-markings "${ddest}" @@ -260,7 +260,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_install-env "${FILESDIR}"/${PN%-loom}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter @@ -273,16 +273,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi } |