From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CAD3138359 for ; Sat, 21 Nov 2020 23:27:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97E3EE076B; Sat, 21 Nov 2020 23:27:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E9C3E076B for ; Sat, 21 Nov 2020 23:27:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0012C33FEFB for ; Sat, 21 Nov 2020 23:27:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C9812CA for ; Sat, 21 Nov 2020 23:27:55 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1606001256.f9e9a8666cd4b64a01bf3f6dcf585e8c4e1dec14.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-7.0.3.1.ebuild app-office/libreoffice/libreoffice-7.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: f9e9a8666cd4b64a01bf3f6dcf585e8c4e1dec14 X-VCS-Branch: master Date: Sat, 21 Nov 2020 23:27:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c639628-e20a-42e6-8bd3-e1730a0b9cc4 X-Archives-Hash: 133d972645942cc5b6468a55e921baf3 commit: f9e9a8666cd4b64a01bf3f6dcf585e8c4e1dec14 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 21 23:24:25 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Nov 21 23:27:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e9a866 app-office/libreoffice: Brute-force compiler settings (clang/gcc) Bug: https://bugs.gentoo.org/739134 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel gentoo.org> app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 26 +++++++++------------- app-office/libreoffice/libreoffice-7.0.9999.ebuild | 26 +++++++++------------- app-office/libreoffice/libreoffice-9999.ebuild | 26 +++++++++------------- 3 files changed, 30 insertions(+), 48 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild index 695c9c5f0f6..e561517b8f5 100644 --- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild @@ -393,41 +393,35 @@ src_configure() { local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" # Show flags set at the beginning - einfo "Current CFLAGS: ${CFLAGS}" - einfo "Current LDFLAGS: ${LDFLAGS}" + einfo "Preset CFLAGS: ${CFLAGS}" + einfo "Preset LDFLAGS: ${LDFLAGS}" - local have_switched_compiler= - if use clang && ! tc-is-clang ; then + if use clang ; then # Force clang einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes AR=llvm-ar CC=${CHOST}-clang CXX=${CHOST}-clang++ NM=llvm-nm RANLIB=llvm-ranlib - elif ! use clang && ! tc-is-gcc ; then + LDFLAGS+=" -fuse-ld=lld" + strip-unsupported-flags + else # Force gcc - have_switched_compiler=yes 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 + strip-unsupported-flags fi export CLANG_CC=${CC} export CLANG_CXX=${CXX} - if [[ -n "${have_switched_compiler}" ]] ; then - # Because we switched active compiler we have to ensure - # that no unsupported flags are set - strip-unsupported-flags - fi - - # Show flags set at the beginning - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" + # Show flags set at the end + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" # Ensure we use correct toolchain tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild index b10bdb491e5..223d653facc 100644 --- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild @@ -389,41 +389,35 @@ src_configure() { local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" # Show flags set at the beginning - einfo "Current CFLAGS: ${CFLAGS}" - einfo "Current LDFLAGS: ${LDFLAGS}" + einfo "Preset CFLAGS: ${CFLAGS}" + einfo "Preset LDFLAGS: ${LDFLAGS}" - local have_switched_compiler= - if use clang && ! tc-is-clang ; then + if use clang ; then # Force clang einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes AR=llvm-ar CC=${CHOST}-clang CXX=${CHOST}-clang++ NM=llvm-nm RANLIB=llvm-ranlib - elif ! use clang && ! tc-is-gcc ; then + LDFLAGS+=" -fuse-ld=lld" + strip-unsupported-flags + else # Force gcc - have_switched_compiler=yes 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 + strip-unsupported-flags fi export CLANG_CC=${CC} export CLANG_CXX=${CXX} - if [[ -n "${have_switched_compiler}" ]] ; then - # Because we switched active compiler we have to ensure - # that no unsupported flags are set - strip-unsupported-flags - fi - - # Show flags set at the beginning - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" + # Show flags set at the end + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" # Ensure we use correct toolchain tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 0bc93233961..67ba6c45bbe 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -389,41 +389,35 @@ src_configure() { local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" # Show flags set at the beginning - einfo "Current CFLAGS: ${CFLAGS}" - einfo "Current LDFLAGS: ${LDFLAGS}" + einfo "Preset CFLAGS: ${CFLAGS}" + einfo "Preset LDFLAGS: ${LDFLAGS}" - local have_switched_compiler= - if use clang && ! tc-is-clang ; then + if use clang ; then # Force clang einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes AR=llvm-ar CC=${CHOST}-clang CXX=${CHOST}-clang++ NM=llvm-nm RANLIB=llvm-ranlib - elif ! use clang && ! tc-is-gcc ; then + LDFLAGS+=" -fuse-ld=lld" + strip-unsupported-flags + else # Force gcc - have_switched_compiler=yes 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 + strip-unsupported-flags fi export LO_CLANG_CC=${CC} export LO_CLANG_CXX=${CXX} - if [[ -n "${have_switched_compiler}" ]] ; then - # Because we switched active compiler we have to ensure - # that no unsupported flags are set - strip-unsupported-flags - fi - - # Show flags set at the beginning - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" + # Show flags set at the end + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" # Ensure we use correct toolchain tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG