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: drop USE=clang in 25.2.3.2 too

Browse Source 
As discussed with asturm, let's backport 65fb81e5c9.

Closes: https://bugs.gentoo.org/953422
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-05-20 20:08:47 +01:00
parent 2eff240987
commit 3ce904a011
1 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds
IUSE="accessibility base bluetooth +branding coinmp +cups custom-cflags +dbus debug eds
googledrive gstreamer +gtk3 gtk4 kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -275,23 +275,6 @@ BDEPEND="
sys-apps/which
sys-devel/gettext
virtual/pkgconfig
clang? ( || (
( llvm-core/clang:19
llvm-core/llvm:19
=llvm-core/lld-19* )
( llvm-core/clang:18
llvm-core/llvm:18
=llvm-core/lld-18* )
( llvm-core/clang:17
llvm-core/llvm:17
=llvm-core/lld-17* )
( llvm-core/clang:16
llvm-core/llvm:16
=llvm-core/lld-16* )
( llvm-core/clang:15
llvm-core/llvm:15
=llvm-core/lld-15* )
) )
odk? ( >=app-text/doxygen-1.8.4 )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
@@ -460,31 +443,9 @@ src_configure() {
# Workaround for bug #915067
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
AR=llvm-ar
CC=${CHOST}-clang
CXX=${CHOST}-clang++
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
AR=gcc-ar
CC=${CHOST}-gcc
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
# Apparently the Clang flags get used even for GCC builds sometimes.
# bug #838115
sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
fi
# Apparently the Clang flags get used even for GCC builds sometimes.
# bug #838115
sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
# ODR violations (not just in skia/vulkan): bug #916435
# Runtime crashes with Clang: bug #907905
@@ -497,8 +458,10 @@ src_configure() {
strip-flags
fi
export LO_CLANG_CC=${CC}
export LO_CLANG_CXX=${CXX}
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}"