commit: eef582156568fee60861384b7cced0efc66e8a3f Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Feb 11 17:21:08 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 17:55:44 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef58215
Revert "dev-java/openjdk: Add support for building the static libraries in the jdk, required to build GraalVM and SubstrateVM" This reverts commit 11ae8761bd08e6de4355cd9d6725afab0c801659. Closes: https://bugs.gentoo.org/969903 (obsolete) Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/45760 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/openjdk/openjdk-17.0.17_p10.ebuild | 11 ++--------- dev-java/openjdk/openjdk-21.0.9_p10.ebuild | 11 ++--------- dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild | 11 ++--------- dev-java/openjdk/openjdk-26_beta34.ebuild | 9 +-------- dev-java/openjdk/openjdk-27_alpha8.ebuild | 9 +-------- 5 files changed, 8 insertions(+), 43 deletions(-) diff --git a/dev-java/openjdk/openjdk-17.0.17_p10.ebuild b/dev-java/openjdk/openjdk-17.0.17_p10.ebuild index f450d2418899..b54cfd8a0783 100644 --- a/dev-java/openjdk/openjdk-17.0.17_p10.ebuild +++ b/dev-java/openjdk/openjdk-17.0.17_p10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2026 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -55,7 +55,7 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs 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 ) @@ -274,7 +274,6 @@ src_compile() { NICE= # Use PORTAGE_NICENESS, don't adjust further down $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - $(usex static-libs static-libs-image) ) emake "${myemakeargs[@]}" -j1 } @@ -329,12 +328,6 @@ src_install() { dodoc -r "${S}"/build/*-release/images/docs/* dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi - - if use static-libs ; then - cd "${S}"/build/*-release/images/static-libs || die - dodir "${dest}" - cp -pPR * "${ddest}" || die - fi } pkg_postinst() { diff --git a/dev-java/openjdk/openjdk-21.0.9_p10.ebuild b/dev-java/openjdk/openjdk-21.0.9_p10.ebuild index 3b4ab8a4da30..54bc09433932 100644 --- a/dev-java/openjdk/openjdk-21.0.9_p10.ebuild +++ b/dev-java/openjdk/openjdk-21.0.9_p10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2026 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -51,7 +51,7 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +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 ) @@ -273,7 +273,6 @@ src_compile() { NICE= # Use PORTAGE_NICENESS, don't adjust further down $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - $(usex static-libs static-libs-image) ) emake "${myemakeargs[@]}" -j1 } @@ -328,12 +327,6 @@ src_install() { dodoc -r "${S}"/build/*-release/images/docs/* dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi - - if use static-libs ; then - cd "${S}"/build/*-release/images/static-libs || die - dodir "${dest}" - cp -pPR * "${ddest}" || die - fi } pkg_postinst() { diff --git a/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild b/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild index cf565fe2ab48..1e5e0f14f2ef 100644 --- a/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild +++ b/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2026 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -73,7 +73,7 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="amd64 arm64 ppc64 ~riscv" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +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 ) @@ -292,7 +292,6 @@ src_compile() { NICE= # Use PORTAGE_NICENESS, don't adjust further down $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - $(usex static-libs static-libs-image) ) emake "${myemakeargs[@]}" -j1 } @@ -346,12 +345,6 @@ src_install() { docinto html dodoc -r "${S}"/build/*-release/images/docs/* fi - - if use static-libs ; then - cd "${S}"/build/*-release/images/static-libs || die - dodir "${dest}" - cp -pPR * "${ddest}" || die - fi } pkg_postinst() { diff --git a/dev-java/openjdk/openjdk-26_beta34.ebuild b/dev-java/openjdk/openjdk-26_beta34.ebuild index 505fdef35077..9921b3ffce32 100644 --- a/dev-java/openjdk/openjdk-26_beta34.ebuild +++ b/dev-java/openjdk/openjdk-26_beta34.ebuild @@ -73,7 +73,7 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" # KEYWORDS="" # Not an LTS candidate -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +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 ) @@ -295,7 +295,6 @@ src_compile() { NICE= # Use PORTAGE_NICENESS, don't adjust further down $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - $(usex static-libs static-libs-image) ) emake "${myemakeargs[@]}" -j1 } @@ -349,12 +348,6 @@ src_install() { docinto html dodoc -r "${S}"/build/*-release/images/docs/* fi - - if use static-libs ; then - cd "${S}"/build/*-release/images/static-libs || die - dodir "${dest}" - cp -pPR * "${ddest}" || die - fi } pkg_postinst() { diff --git a/dev-java/openjdk/openjdk-27_alpha8.ebuild b/dev-java/openjdk/openjdk-27_alpha8.ebuild index 821c19f5ec71..196940065329 100644 --- a/dev-java/openjdk/openjdk-27_alpha8.ebuild +++ b/dev-java/openjdk/openjdk-27_alpha8.ebuild @@ -73,7 +73,7 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" # KEYWORDS="" # Not an LTS candidate -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +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 ) @@ -295,7 +295,6 @@ src_compile() { NICE= # Use PORTAGE_NICENESS, don't adjust further down $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - $(usex static-libs static-libs-image) ) emake "${myemakeargs[@]}" -j1 } @@ -349,12 +348,6 @@ src_install() { docinto html dodoc -r "${S}"/build/*-release/images/docs/* fi - - if use static-libs ; then - cd "${S}"/build/*-release/images/static-libs || die - dodir "${dest}" - cp -pPR * "${ddest}" || die - fi } pkg_postinst() {
