[gentoo-commits] proj/java:master commit in: dev-java/openjdk-loom/
commit: b83dce5db15880248c03cddacd9318030cc2efa5 Author: Florian Schmaus gentoo org> AuthorDate: Sun Jun 16 08:03:28 2024 + Commit: Florian Schmaus gentoo org> CommitDate: Sun Jun 16 08:03:28 2024 + URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=b83dce5d dev-java/openjdk-loom: drop 19_pre20221116 Signed-off-by: Florian Schmaus gentoo.org> .../openjdk-loom-19_pre20221116.ebuild | 276 - 1 file changed, 276 deletions(-) diff --git a/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild b/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild deleted file mode 100644 index 506d9a8c.. --- a/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs eapi8-dosym flag-o-matic git-r3 java-pkg-2 java-vm-2 multiprocessing toolchain-funcs - -MY_PV="${PV//_p/+}" -SLOT="$(ver_cut 1)" - -DESCRIPTION="Experimental OpenJDK with Project Loom (Fibers / Virtual Threads)" -HOMEPAGE="https://openjdk.org; -EGIT_REPO_URI="https://github.com/openjdk/loom.git; -EGIT_COMMIT="4047afb36f33b9dfc537be2047869a3f7940654e" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -IUSE="alsa big-endian cups debug doc examples headless-awt javafx jbootstrap selinux source +system-bootstrap systemtap" - -REQUIRED_USE=" - javafx? ( alsa !headless-awt ) - !system-bootstrap? ( jbootstrap ) -" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) - system-bootstrap? ( - || ( - dev-java/openjdk-bin:20 - dev-java/openjdk:20 - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - ) -" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - [[ ${MERGE_TYPE} == "binary" ]] && return - - 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}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - 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
[gentoo-commits] proj/java:master commit in: dev-java/openjdk-loom/
commit: 6f0fdac1521593a9ca20b7853bd4ed00971d0666 Author: Florian Schmaus gentoo org> AuthorDate: Sun Jan 29 12:55:41 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Sun Jan 29 12:55:41 2023 + URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=6f0fdac1 dev-java/openjdk-loom: add 21_pre20230127 Signed-off-by: Florian Schmaus gentoo.org> .../openjdk-loom-21_pre20230127.ebuild | 277 + 1 file changed, 277 insertions(+) diff --git a/dev-java/openjdk-loom/openjdk-loom-21_pre20230127.ebuild b/dev-java/openjdk-loom/openjdk-loom-21_pre20230127.ebuild new file mode 100644 index ..5b3b1bdb --- /dev/null +++ b/dev-java/openjdk-loom/openjdk-loom-21_pre20230127.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit check-reqs flag-o-matic git-r3 java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +MY_PV="${PV//_p/+}" +SLOT="$(ver_cut 1)" + +DESCRIPTION="Experimental OpenJDK with Project Loom (Fibers / Virtual Threads)" +HOMEPAGE="https://openjdk.org; +EGIT_REPO_URI="https://github.com/openjdk/loom.git; +EGIT_COMMIT="b6f785d836dad7b7a2ac992cda02514d88fede95" + +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +IUSE="alsa big-endian cups debug doc examples headless-awt javafx jbootstrap selinux source +system-bootstrap systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) +" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/harfbuzz:= + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + media-libs/libjpeg-turbo:0= + systemtap? ( dev-util/systemtap ) +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + javafx? ( dev-java/openjfx:${SLOT}= ) + system-bootstrap? ( + || ( + dev-java/openjdk-bin:20 + dev-java/openjdk:20 + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + ) +" + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + 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}" + + # The nastiness below is necessary while the gentoo-vm USE flag is + # masked. First we call java-pkg-2_pkg_setup if it looks like the + # flag was unmasked against one of the possible build VMs. If not, + # we try finding one of them in their expected locations. This would + # have been slightly less messy if openjdk-bin had been installed to + # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env + # file but disable it so that it would not normally be selectable. + + local vm + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + 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() { + local build_jdk_ver=20 + if has_version
[gentoo-commits] proj/java:master commit in: dev-java/openjdk-loom/
commit: e525a26fe49cf2e756d60e7a26c01364c47b9573 Author: Florian Schmaus gentoo org> AuthorDate: Sun Jan 29 12:36:58 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Sun Jan 29 12:36:58 2023 + URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=e525a26f dev-java/openjdk-loom: update LICENSE Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild b/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild index 01de88c6..506d9a8c 100644 --- a/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild +++ b/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="https://openjdk.org; EGIT_REPO_URI="https://github.com/openjdk/loom.git; EGIT_COMMIT="4047afb36f33b9dfc537be2047869a3f7940654e" -LICENSE="GPL-2" +LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx jbootstrap selinux source +system-bootstrap systemtap"
[gentoo-commits] proj/java:master commit in: dev-java/openjdk-loom/files/, dev-java/openjdk-loom/
commit: 458003fad7c2ffe875273b4fd352de9ec7384762 Author: Florian Schmaus gentoo org> AuthorDate: Wed Nov 16 18:45:47 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Nov 16 18:45:59 2022 + URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=458003fa dev-java/openjdk-loom: add 19_pre20221116, drop 19_pre20220513 Signed-off-by: Florian Schmaus gentoo.org> .../{openjdk-loom-19.env.sh => openjdk.env.sh} | 3 -- dev-java/openjdk-loom/metadata.xml | 1 - ...3.ebuild => openjdk-loom-19_pre20221116.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 similarity index 80% rename from dev-java/openjdk-loom/files/openjdk-loom-19.env.sh rename to 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 @@ Don't install the X backend for AWT, needed by some GUIs - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!) Provide JavaFX support via dev-java/openjfx Import OpenJFX modules at build time, via dev-java/openjfx Build OpenJDK twice, the second time using the result of the first diff --git a/dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild b/dev-java/openjdk-loom/openjdk-loom-19_pre20221116.ebuild similarity index 83% rename from dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild rename to 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 -
[gentoo-commits] proj/java:master commit in: dev-java/openjdk-loom/files/, dev-java/openjdk-loom/
commit: 41315cbafab89e942f70befa0f6d0b51bdb9b583 Author: Florian Schmaus gentoo org> AuthorDate: Fri May 13 08:12:21 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Fri May 13 08:12:21 2022 + URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=41315cba dev-java/openjdk-loom: new package, add 19_pre20220513 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-loom/files/openjdk-loom-19.env.sh | 16 ++ dev-java/openjdk-loom/metadata.xml | 30 +++ .../openjdk-loom-19_pre20220513.ebuild | 288 + 3 files changed, 334 insertions(+) diff --git a/dev-java/openjdk-loom/files/openjdk-loom-19.env.sh b/dev-java/openjdk-loom/files/openjdk-loom-19.env.sh new file mode 100644 index ..7db6461b --- /dev/null +++ b/dev-java/openjdk-loom/files/openjdk-loom-19.env.sh @@ -0,0 +1,16 @@ +# 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}" +JAVAC="\${JAVA_HOME}/bin/javac" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-loom/metadata.xml b/dev-java/openjdk-loom/metadata.xml new file mode 100644 index ..e53a64e3 --- /dev/null +++ b/dev-java/openjdk-loom/metadata.xml @@ -0,0 +1,30 @@ + +https://www.gentoo.org/dtd/metadata.dtd;> + + + f...@gentoo.org + Florian Schmaus + + + j...@gentoo.org + Java + + + Java™ is the world's leading programming language and platform. + The code for Java is open source and available at OpenJDK™. + + + Java™ 8 is Java™ 1.8, where 8 is the version number, and 1.8 is the version string + Java™ version 11 + + + Don't install the X backend for AWT, needed by some GUIs + Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!) + Provide JavaFX support via dev-java/openjfx + Import OpenJFX modules at build time, via dev-java/openjfx + Build OpenJDK twice, the second time using the result of the first + Install JVM sources + Bootstrap using installed openjdk + Enable SystemTAP/DTrace tracing + + diff --git a/dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild b/dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild new file mode 100644 index ..245c7bcd --- /dev/null +++ b/dev-java/openjdk-loom/openjdk-loom-19_pre20220513.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit check-reqs eapi8-dosym flag-o-matic git-r3 java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +MY_PV="${PV//_p/+}" +SLOT="$(ver_cut 1)" + +DESCRIPTION="Experimental OpenJDK with Project Loom (Fibers / Virtual Threads)" +HOMEPAGE="https://openjdk.java.net; +EGIT_REPO_URI="https://github.com/openjdk/loom.git; +EGIT_COMMIT="6520b71a62baf64d214ff94c9291bfc513dfbe51" + +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" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) +" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/harfbuzz:= + media-libs/libpng:0= + media-libs/lcms:2= + sys-libs/zlib + virtual/jpeg:0= + systemtap? ( dev-util/systemtap ) +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst +