gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-office/libreoffice: avoid Clang harder

Browse Source 
... otherwise it gets used automatically for Skia-only.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-05-20 22:26:20 +01:00
parent 227dc5442b
commit d541380aae
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app-office/libreoffice/libreoffice-25.2.3.2.ebuild
View File

@@ -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}"

13
app-office/libreoffice/libreoffice-25.2.9999.ebuild
View File

@@ -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}"

13
app-office/libreoffice/libreoffice-9999.ebuild
View File

@@ -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}"