From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
Date: Sat, 18 Jun 2022 14:27:27 +0000 (UTC) [thread overview]
Message-ID: <1655562082.bce861717d5120f95d17eec6ce9d672ae791e80c.asturm@gentoo> (raw)
commit: bce861717d5120f95d17eec6ce9d672ae791e80c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 23:10:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:21:22 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bce86171
dev-qt/qtcore: add FORTIFY_SOURCE=3 workaround (force back to =2)
As discussed with asturm until we know what's happening with
the upstream bug. We can consider the opensuse patch once
that's resolved, if the upstream fix isn't made public, almost
certainly via KDE Qt5PatchCollection. But we'll see.
Bug: https://bugs.gentoo.org/847145
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.15.5.9999.ebuild | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild
index 84966e24..1f4a57ff 100644
--- a/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
QT5_MODULE="qtbase"
-inherit linux-info qt5-build
+inherit linux-info flag-o-matic qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -58,6 +58,25 @@ src_prepare() {
# fix missing qt_version_tag symbol w/ LTO, bug 674382
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
+ # modified GCC to set 3).
+ #
+ # Refs:
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
+ # 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.
+ filter-flags -D_FORTIFY_SOURCE=3
+ # (Qt doesn't seem to respect CPPFLAGS?)
+ append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
qt5-build_src_prepare
}
next reply other threads:[~2022-06-18 14:27 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-18 14:27 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:09 [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ Andreas Sturmlechner
2023-10-08 15:21 Andreas Sturmlechner
2023-10-07 20:40 Andreas Sturmlechner
2023-09-03 8:02 Andreas Sturmlechner
2023-06-22 15:53 Andreas Sturmlechner
2022-05-20 6:46 Andreas Sturmlechner
2022-03-21 10:06 Andreas Sturmlechner
2021-02-02 0:49 Andreas Sturmlechner
2020-04-12 18:09 Andreas Sturmlechner
2020-04-10 21:33 Andreas Sturmlechner
2020-04-09 18:18 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2019-08-24 9:14 Jimi Huotari
2019-08-04 12:43 Michael Palimaka
2019-01-07 20:33 Davide Pesavento
2019-01-07 1:04 Davide Pesavento
2018-09-13 10:30 Jimi Huotari
2018-02-22 22:19 Andreas Sturmlechner
2018-02-06 12:32 Michael Palimaka
2018-02-02 11:54 Michael Palimaka
2017-12-09 23:02 Jimi Huotari
2017-09-08 15:52 Michael Palimaka
2017-04-18 16:15 Davide Pesavento
2017-04-18 16:15 Davide Pesavento
2017-01-25 18:30 Michael Palimaka
2017-01-25 17:24 Michael Palimaka
2016-11-30 17:23 Michael Palimaka
2016-04-24 15:52 Davide Pesavento
2016-04-24 15:52 Davide Pesavento
2015-05-10 1:18 Davide Pesavento
2015-03-26 1:49 Davide Pesavento
2014-12-09 3:22 Davide Pesavento
2014-11-10 3:02 Davide Pesavento
2014-10-27 0:53 Davide Pesavento
2014-10-13 19:35 Davide Pesavento
2014-09-01 0:26 Davide Pesavento
2014-08-27 2:16 Davide Pesavento
2014-07-29 22:14 Davide Pesavento
2014-07-24 1:05 Davide Pesavento
2014-06-01 2:41 Davide Pesavento
2014-06-01 2:41 Davide Pesavento
2014-05-27 10:48 Davide Pesavento
2014-05-23 18:18 Davide Pesavento
2013-04-22 1:07 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1655562082.bce861717d5120f95d17eec6ce9d672ae791e80c.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox