commit:     2a013509ee49f7d285538b5c973e703987586b76
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  7 19:51:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  7 21:22:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a013509

app-arch/xz-utils: use dot-a.eclass

... to avoid installing broken static libraries w/ LTO.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/xz-utils/xz-utils-5.8.1.ebuild | 9 ++++++++-
 app-arch/xz-utils/xz-utils-9999.ebuild  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.8.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.8.1.ebuild
index 05cadfee0ca4..2b542e4db3b6 100644
--- a/app-arch/xz-utils/xz-utils-5.8.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.8.1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit libtool multilib multilib-minimal preserve-libs toolchain-funcs
+inherit dot-a libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
        # Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -65,6 +65,11 @@ src_prepare() {
        fi
 }
 
+src_configure() {
+       use static-libs && lto-guarantee-fat
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myconf=(
                --enable-threads
@@ -183,6 +188,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        find "${ED}" -type f -name '*.la' -delete || die
 
        if use doc ; then

diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild 
b/app-arch/xz-utils/xz-utils-9999.ebuild
index b4b85808bcc3..dd0bcb3489e8 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit libtool multilib multilib-minimal preserve-libs toolchain-funcs
+inherit dot-a libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
        # Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -65,6 +65,11 @@ src_prepare() {
        fi
 }
 
+src_configure() {
+       use static-libs && lto-guarantee-fat
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myconf=(
                --enable-threads
@@ -183,6 +188,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       strip-lto-bytecode
+
        find "${ED}" -type f -name '*.la' -delete || die
 
        if use doc ; then

Reply via email to