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 A7841138359 for ; Sun, 22 Nov 2020 17:00:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8CD9E077F; Sun, 22 Nov 2020 17:00:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 99F2DE077F for ; Sun, 22 Nov 2020 17:00:40 +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 DE673335DA5 for ; Sun, 22 Nov 2020 17:00:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60A5B435 for ; Sun, 22 Nov 2020 17:00:37 +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: <1606064424.811fff30b782a18f80c85e8d1edf10fcec392445.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: 811fff30b782a18f80c85e8d1edf10fcec392445 X-VCS-Branch: master Date: Sun, 22 Nov 2020 17:00:37 +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: ef53b016-d60f-4348-af54-53c2e878459e X-Archives-Hash: 7a27e49a5034303e6f7bc111ca913219 commit: 811fff30b782a18f80c85e8d1edf10fcec392445 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Nov 22 16:57:53 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Nov 22 17:00:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811fff30 app-office/libreoffice: Add useflag custom-cflags 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 | 9 ++++++++- app-office/libreoffice/libreoffice-7.0.9999.ebuild | 9 ++++++++- app-office/libreoffice/libreoffice-9999.ebuild | 11 +++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild index 0ead7020099..a83494ecc5e 100644 --- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild @@ -405,7 +405,6 @@ src_configure() { NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" - strip-unsupported-flags else # Force gcc einfo "Enforcing the use of gcc due to USE=-clang ..." @@ -414,8 +413,16 @@ src_configure() { CXX=${CHOST}-g++ NM=gcc-nm RANLIB=gcc-ranlib + fi + + if use custom-cflags ; then + elog "USE=custom-cflags has been selected. You are on your own to make sure that" + elog "the build succeeds. Good luck!" strip-unsupported-flags + else + strip-flags fi + export CLANG_CC=${CC} export CLANG_CXX=${CXX} diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild index c04d5929a50..1423e832b11 100644 --- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild @@ -401,7 +401,6 @@ src_configure() { NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" - strip-unsupported-flags else # Force gcc einfo "Enforcing the use of gcc due to USE=-clang ..." @@ -410,8 +409,16 @@ src_configure() { CXX=${CHOST}-g++ NM=gcc-nm RANLIB=gcc-ranlib + fi + + if use custom-cflags ; then + elog "USE=custom-cflags has been selected. You are on your own to make sure that" + elog "the build succeeds. Good luck!" strip-unsupported-flags + else + strip-flags fi + export CLANG_CC=${CC} export CLANG_CXX=${CXX} diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 816e95d62a1..cc2390bea4c 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -82,7 +82,7 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird +IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" @@ -401,7 +401,6 @@ src_configure() { NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" - strip-unsupported-flags else # Force gcc einfo "Enforcing the use of gcc due to USE=-clang ..." @@ -410,8 +409,16 @@ src_configure() { CXX=${CHOST}-g++ NM=gcc-nm RANLIB=gcc-ranlib + fi + + if use custom-cflags ; then + elog "USE=custom-cflags has been selected. You are on your own to make sure that" + elog "the build succeeds. Good luck!" strip-unsupported-flags + else + strip-flags fi + export LO_CLANG_CC=${CC} export LO_CLANG_CXX=${CXX}