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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A76A15800A for ; Sun, 6 Aug 2023 11:49:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C84E2BC013; Sun, 6 Aug 2023 11:49:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FF3E2BC017 for ; Sun, 6 Aug 2023 11:49:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25B42340E28 for ; Sun, 6 Aug 2023 11:49:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79516F15 for ; Sun, 6 Aug 2023 11:49:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691322473.5a84e57a1963e12919d9b843324d70b12e992bc7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtcore/qtcore-5.15.10-r1.ebuild dev-qt/qtcore/qtcore-5.15.10.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a84e57a1963e12919d9b843324d70b12e992bc7 X-VCS-Branch: master Date: Sun, 6 Aug 2023 11:49:05 +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: 3f2fc5ee-6272-4a6b-844b-a2f7470b41fe X-Archives-Hash: 84144f03cc9d2b87d7e782d30db528cd commit: 5a84e57a1963e12919d9b843324d70b12e992bc7 Author: Sam James gentoo org> AuthorDate: Sun Aug 6 11:41:48 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 6 11:47:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a84e57a dev-qt/qtcore: use tc-enables-fortify-source Better than fragile optimisation level checking. Bug: https://bugs.gentoo.org/841770 Bug: https://bugs.gentoo.org/847145 Bug: https://bugs.gentoo.org/852974 Signed-off-by: Sam James gentoo.org> dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 5 +++-- dev-qt/qtcore/qtcore-5.15.10.ebuild | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild index f42cc15498c0..8153d9098fae 100644 --- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then fi QT5_MODULE="qtbase" -inherit linux-info flag-o-matic qt5-build +inherit linux-info flag-o-matic toolchain-funcs qt5-build DESCRIPTION="Cross-platform application development framework" SLOT=5/${QT5_PV} @@ -60,6 +60,7 @@ src_prepare() { sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die # Broken with FORTIFY_SOURCE=3 + # # Our toolchain sets F_S=2 by default w/ >= -O2, so we need # to unset F_S first, then explicitly set 2, to negate any default # and anything set by the user if they're choosing 3 (or if they've @@ -70,7 +71,7 @@ src_prepare() { # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 # https://bugreports.qt.io/browse/QTBUG-103782 # bug #847145 - if is-flagq '-O[23]' || is-flagq '-Ofast' ; then + if tc-enables-fortify-source ; then # We can't unconditionally do this b/c we fortify needs # some level of optimisation. filter-flags -D_FORTIFY_SOURCE=3 diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild b/dev-qt/qtcore/qtcore-5.15.10.ebuild index 4964d74eb06f..606b3ffff929 100644 --- a/dev-qt/qtcore/qtcore-5.15.10.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.10.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then fi QT5_MODULE="qtbase" -inherit linux-info flag-o-matic qt5-build +inherit linux-info flag-o-matic toolchain-funcs qt5-build DESCRIPTION="Cross-platform application development framework" SLOT=5/${QT5_PV} @@ -60,6 +60,7 @@ src_prepare() { sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die # Broken with FORTIFY_SOURCE=3 + # # Our toolchain sets F_S=2 by default w/ >= -O2, so we need # to unset F_S first, then explicitly set 2, to negate any default # and anything set by the user if they're choosing 3 (or if they've @@ -70,9 +71,7 @@ src_prepare() { # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 # https://bugreports.qt.io/browse/QTBUG-103782 # bug #847145 - if is-flagq '-O[23]' || is-flagq '-Ofast' ; then - # We can't unconditionally do this b/c we fortify needs - # some level of optimisation. + if tc-enables-fortify-source ; then filter-flags -D_FORTIFY_SOURCE=3 # (Qt doesn't seem to respect CPPFLAGS?) append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2