commit: d541380aae7ca7ca5d45918f6e0e1e2aeb44be71
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 20 21:26:20 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 20 21:26:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d541380a
app-office/libreoffice: avoid Clang harder
... otherwise it gets used automatically for Skia-only.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-25.2.3.2.ebuild | 13 ++++++-------
app-office/libreoffice/libreoffice-25.2.9999.ebuild | 13 ++++++-------
app-office/libreoffice/libreoffice-9999.ebuild | 13 ++++++-------
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
index 49baf2d3372e..4fd9a197443e 100644
--- a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild
@@ -443,10 +443,14 @@ src_configure() {
# Workaround for bug #915067
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
+ # Clang flags get used even for GCC builds sometimes (bug #838115)
+ # (... because of our LO_CLANG_* hack)
sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk
|| die
+ # Don't use Clang for building Skia regardless of CC/CXX!
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
# ODR violations (not just in skia/vulkan): bug #916435
# Runtime crashes with Clang: bug #907905
filter-lto
@@ -458,11 +462,6 @@ src_configure() {
strip-flags
fi
- if tc-is-clang ; then
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
- fi
-
# Show flags set at the end
einfo " Used CFLAGS: ${CFLAGS}"
einfo " Used LDFLAGS: ${LDFLAGS}"
diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild
b/app-office/libreoffice/libreoffice-25.2.9999.ebuild
index 2bf4d7c93275..a557644d7d5e 100644
--- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild
@@ -442,10 +442,14 @@ src_configure() {
# Workaround for bug #915067
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
+ # Clang flags get used even for GCC builds sometimes (bug #838115)
+ # (... because of our LO_CLANG_* hack)
sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk
|| die
+ # Don't use Clang for building Skia regardless of CC/CXX!
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
# ODR violations (not just in skia/vulkan): bug #916435
# Runtime crashes with Clang: bug #907905
filter-lto
@@ -457,11 +461,6 @@ src_configure() {
strip-flags
fi
- if tc-is-clang ; then
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
- fi
-
# Show flags set at the end
einfo " Used CFLAGS: ${CFLAGS}"
einfo " Used LDFLAGS: ${LDFLAGS}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index e23a10ac4e40..3374c5e9bf76 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -427,10 +427,14 @@ src_configure() {
# Workaround for bug #915067
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
+ # Clang flags get used even for GCC builds sometimes (bug #838115)
+ # (... because of our LO_CLANG_* hack)
sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk
|| die
+ # Don't use Clang for building Skia regardless of CC/CXX!
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
# ODR violations (not just in skia/vulkan): bug #916435
# Runtime crashes with Clang: bug #907905
filter-lto
@@ -442,11 +446,6 @@ src_configure() {
strip-flags
fi
- if tc-is-clang ; then
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
- fi
-
# Show flags set at the end
einfo " Used CFLAGS: ${CFLAGS}"
einfo " Used LDFLAGS: ${LDFLAGS}"
