commit:     51cf1825cf0b39de92758c264ec23497367febd3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 00:29:50 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 00:29:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51cf1825

app-office/libreoffice: backport filter-lto to stable too

Bug: https://bugs.gentoo.org/916435
Closes: https://bugs.gentoo.org/950174
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild | 7 ++++---
 app-office/libreoffice/libreoffice-24.2.7.2.ebuild    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild 
b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
index b1e492d38a7f..855a2250d08e 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
@@ -412,9 +412,6 @@ src_configure() {
                RANLIB=llvm-ranlib
                LDFLAGS+=" -fuse-ld=lld"
 
-               # Workaround for bug #907905
-               filter-lto
-
                # Not implemented by Clang, bug #903889
                filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
        else
@@ -431,6 +428,10 @@ src_configure() {
                sed -i -e "s/-flto=thin/-flto/" 
solenv/gbuild/platform/com_GCC_defs.mk || die
        fi
 
+       # ODR violations (not just in skia/vulkan): bug #916435
+       # Runtime crashes with Clang: bug #907905
+       filter-lto
+
        if use custom-cflags ; then
                elog "USE=custom-cflags has been selected. You are on your own 
to make sure that"
                elog "the build succeeds. Good luck!"

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild 
b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
index 1d23a5c8bf96..55225b6e3690 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
@@ -442,9 +442,6 @@ src_configure() {
                RANLIB=llvm-ranlib
                LDFLAGS+=" -fuse-ld=lld"
 
-               # Workaround for bug #907905
-               filter-lto
-
                # Not implemented by Clang, bug #903889
                filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
        else
@@ -461,6 +458,10 @@ src_configure() {
                sed -i -e "s/-flto=thin/-flto/" 
solenv/gbuild/platform/com_GCC_defs.mk || die
        fi
 
+       # ODR violations (not just in skia/vulkan): bug #916435
+       # Runtime crashes with Clang: bug #907905
+       filter-lto
+
        if use custom-cflags ; then
                elog "USE=custom-cflags has been selected. You are on your own 
to make sure that"
                elog "the build succeeds. Good luck!"

Reply via email to