commit: 6c861bea0e55bf8297fc4de6713361bc8b2616dd Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Feb 11 17:18:46 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=6c861bea
Revert "dev-java/openjdk: Add LTO cleanup to static libraries using dot-a eclass" This reverts commit 855c743e8a78f7df0331579df56f9ecc922a70da. Bug: https://bugs.gentoo.org/969903 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 | 7 +------ dev-java/openjdk/openjdk-21.0.9_p10.ebuild | 7 +------ dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild | 7 +------ dev-java/openjdk/openjdk-26_beta34.ebuild | 8 ++------ dev-java/openjdk/openjdk-27_alpha8.ebuild | 7 +------ 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/dev-java/openjdk/openjdk-17.0.17_p10.ebuild b/dev-java/openjdk/openjdk-17.0.17_p10.ebuild index 58c9ccff9cca..f450d2418899 100644 --- a/dev-java/openjdk/openjdk-17.0.17_p10.ebuild +++ b/dev-java/openjdk/openjdk-17.0.17_p10.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Avoid circular dependency JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" -inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK ARM64_XPAK="17.0.2_p8" # musl bootstrap install @@ -254,10 +254,6 @@ src_configure() { addpredict /proc/self/coredump_filter fi - if use static-libs ; then - lto-guarantee-fat - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -338,7 +334,6 @@ src_install() { cd "${S}"/build/*-release/images/static-libs || die dodir "${dest}" cp -pPR * "${ddest}" || die - strip-lto-bytecode "${ddest}" || die fi } diff --git a/dev-java/openjdk/openjdk-21.0.9_p10.ebuild b/dev-java/openjdk/openjdk-21.0.9_p10.ebuild index e1442100ac67..3b4ab8a4da30 100644 --- a/dev-java/openjdk/openjdk-21.0.9_p10.ebuild +++ b/dev-java/openjdk/openjdk-21.0.9_p10.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Avoid circular dependency JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" -inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball @@ -253,10 +253,6 @@ src_configure() { addpredict /proc/self/coredump_filter fi - if use static-libs ; then - lto-guarantee-fat - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -337,7 +333,6 @@ src_install() { cd "${S}"/build/*-release/images/static-libs || die dodir "${dest}" cp -pPR * "${ddest}" || die - strip-lto-bytecode "${ddest}" || die fi } 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 92fea736e772..cf565fe2ab48 100644 --- a/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild +++ b/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Avoid circular dependency JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" -inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK PPC64_XPAK="25_p36" # big-endian bootstrap tarball @@ -272,10 +272,6 @@ src_configure() { addpredict /proc/self/coredump_filter fi - if use static-libs ; then - lto-guarantee-fat - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -355,7 +351,6 @@ src_install() { cd "${S}"/build/*-release/images/static-libs || die dodir "${dest}" cp -pPR * "${ddest}" || die - strip-lto-bytecode "${ddest}" || die fi } diff --git a/dev-java/openjdk/openjdk-26_beta34.ebuild b/dev-java/openjdk/openjdk-26_beta34.ebuild index 0072fb38e779..505fdef35077 100644 --- a/dev-java/openjdk/openjdk-26_beta34.ebuild +++ b/dev-java/openjdk/openjdk-26_beta34.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Avoid circular dependency JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" -inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK PPC64_XPAK="25_p36" # big-endian bootstrap tarball @@ -275,10 +275,6 @@ src_configure() { addpredict /proc/self/coredump_filter fi - if use static-libs ; then - lto-guarantee-flat - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -356,8 +352,8 @@ src_install() { if use static-libs ; then cd "${S}"/build/*-release/images/static-libs || die + dodir "${dest}" cp -pPR * "${ddest}" || die - strip-lto-bytecode "${ddest}" || die fi } diff --git a/dev-java/openjdk/openjdk-27_alpha8.ebuild b/dev-java/openjdk/openjdk-27_alpha8.ebuild index 4cade3a5ac2c..821c19f5ec71 100644 --- a/dev-java/openjdk/openjdk-27_alpha8.ebuild +++ b/dev-java/openjdk/openjdk-27_alpha8.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Avoid circular dependency JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" -inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs # variable name format: <UPPERCASE_KEYWORD>_XPAK PPC64_XPAK="25_p36" # big-endian bootstrap tarball @@ -275,10 +275,6 @@ src_configure() { addpredict /proc/self/coredump_filter fi - if use static-libs ; then - lto-guarantee-fat - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -358,7 +354,6 @@ src_install() { cd "${S}"/build/*-release/images/static-libs || die dodir "${dest}" cp -pPR * "${ddest}" || die - strip-lto-bytecode "${ddest}" || die fi }
