commit:     a8bc6a8db5b901e34f5501a6cd3dde65ce429ae9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 22:33:21 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 22:33:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bc6a8d

app-office/libreoffice: filter LTO again

I changed my mind after seeing more ODR violations in LO itself.

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

 app-office/libreoffice/libreoffice-25.2.1.1.ebuild | 9 +++------
 app-office/libreoffice/libreoffice-9999.ebuild     | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild 
b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild
index 27cba7b62c8f..86f276de0df2 100644
--- a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild
@@ -408,9 +408,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
@@ -427,9 +424,9 @@ src_configure() {
                sed -i -e "s/-flto=thin/-flto/" 
solenv/gbuild/platform/com_GCC_defs.mk || die
        fi
 
-       # Workaround for bug #916435. Not ideal but www-client/firefox has
-       # the same issue.
-       filter-flags '-Werror=odr'
+       # 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"

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index f2a1bdc64ac8..d76a93203d4e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -408,9 +408,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
@@ -427,9 +424,9 @@ src_configure() {
                sed -i -e "s/-flto=thin/-flto/" 
solenv/gbuild/platform/com_GCC_defs.mk || die
        fi
 
-       # Workaround for bug #916435. Not ideal but www-client/firefox has
-       # the same issue.
-       filter-flags '-Werror=odr'
+       # 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"

Reply via email to