commit: ec1cae0ebc814755c9cf1dd5b5a70d1777d422b8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 6 11:41:48 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 8 15:20:41 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ec1cae0e
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 <sam <AT> gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtcore/qtcore-5.15.11.9999.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild index fdea7264..36a727a0 100644 --- a/dev-qt/qtcore/qtcore-5.15.11.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.11.9999.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} @@ -59,6 +59,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 @@ -69,7 +70,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
