From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/
Date: Sat, 29 Apr 2023 09:43:34 +0000 (UTC) [thread overview]
Message-ID: <1682761359.fca841ad33dbb0e5c6cd29950331b30ab2364d8d.ionen@gentoo> (raw)
commit: fca841ad33dbb0e5c6cd29950331b30ab2364d8d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 09:02:52 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 09:42:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca841ad
app-emulation/dxvk: update flags filters
* -fstack-clash-protection (bug #758914): ICE was fixed, if still
run into this then updating gcc to a newer _p* snapshot should
sort it (alternatively, use released >=gcc-13.1.0)
* -fstack-protector* (bug #870136): mingw64-runtime-11.0.0 adds
its own (partial) ssp support, allowing -D_FORTIFY_SOURCE=3 and
-fstack-protector-strong without libssp. Using these to build
Wine currently still leads to failure, but we can allow it here.
Bug: https://bugs.gentoo.org/758914
Bug: https://bugs.gentoo.org/870136
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/dxvk/dxvk-1.10.3.ebuild | 8 ++++++--
app-emulation/dxvk/dxvk-2.0.ebuild | 8 ++++++--
app-emulation/dxvk/dxvk-2.1.ebuild | 8 ++++++--
app-emulation/dxvk/dxvk-2.1_p20230207.ebuild | 8 ++++++--
app-emulation/dxvk/dxvk-9999.ebuild | 8 ++++++--
5 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/app-emulation/dxvk/dxvk-1.10.3.ebuild b/app-emulation/dxvk/dxvk-1.10.3.ebuild
index 3995d9ee33e0..e9f3f4344b63 100644
--- a/app-emulation/dxvk/dxvk-1.10.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3.ebuild
@@ -73,10 +73,14 @@ src_configure() {
if [[ ${CHOST} != *-mingw* ]]; then
if [[ ! -v MINGW_BYPASS ]]; then
unset AR CC CXX RC STRIP
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
filter-flags '-fuse-ld=*'
filter-flags '-mfunction-return=thunk*' #878849
+ if has_version '<dev-util/mingw64-toolchain-11' ||
+ { use crossdev-mingw &&
+ has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+ then
+ filter-flags '-fstack-protector*' #870136
+ fi
fi
CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-2.0.ebuild b/app-emulation/dxvk/dxvk-2.0.ebuild
index 48c2560d3808..f2b240b7f42a 100644
--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ b/app-emulation/dxvk/dxvk-2.0.ebuild
@@ -89,10 +89,14 @@ src_configure() {
if [[ ${CHOST} != *-mingw* ]]; then
if [[ ! -v MINGW_BYPASS ]]; then
unset AR CC CXX RC STRIP
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
filter-flags '-fuse-ld=*'
filter-flags '-mfunction-return=thunk*' #878849
+ if has_version '<dev-util/mingw64-toolchain-11' ||
+ { use crossdev-mingw &&
+ has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+ then
+ filter-flags '-fstack-protector*' #870136
+ fi
fi
CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-2.1.ebuild b/app-emulation/dxvk/dxvk-2.1.ebuild
index d58b78a8f0ef..1e497fc5a838 100644
--- a/app-emulation/dxvk/dxvk-2.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1.ebuild
@@ -98,10 +98,14 @@ src_configure() {
if [[ ${CHOST} != *-mingw* ]]; then
if [[ ! -v MINGW_BYPASS ]]; then
unset AR CC CXX RC STRIP
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
filter-flags '-fuse-ld=*'
filter-flags '-mfunction-return=thunk*' #878849
+ if has_version '<dev-util/mingw64-toolchain-11' ||
+ { use crossdev-mingw &&
+ has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+ then
+ filter-flags '-fstack-protector*' #870136
+ fi
fi
CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
index 24b2a3ad1e50..c3830098d829 100644
--- a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
@@ -100,10 +100,14 @@ src_configure() {
if [[ ${CHOST} != *-mingw* ]]; then
if [[ ! -v MINGW_BYPASS ]]; then
unset AR CC CXX RC STRIP
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
filter-flags '-fuse-ld=*'
filter-flags '-mfunction-return=thunk*' #878849
+ if has_version '<dev-util/mingw64-toolchain-11' ||
+ { use crossdev-mingw &&
+ has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+ then
+ filter-flags '-fstack-protector*' #870136
+ fi
fi
CHOST_amd64=x86_64-w64-mingw32
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index 7b1ccff1d6f4..313a58896371 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -94,10 +94,14 @@ src_configure() {
if [[ ${CHOST} != *-mingw* ]]; then
if [[ ! -v MINGW_BYPASS ]]; then
unset AR CC CXX RC STRIP
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
filter-flags '-fuse-ld=*'
filter-flags '-mfunction-return=thunk*' #878849
+ if has_version '<dev-util/mingw64-toolchain-11' ||
+ { use crossdev-mingw &&
+ has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
+ then
+ filter-flags '-fstack-protector*' #870136
+ fi
fi
CHOST_amd64=x86_64-w64-mingw32
next reply other threads:[~2023-04-29 9:43 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-29 9:43 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-19 9:35 [gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/ Arthur Zamarin
2025-09-19 9:35 Arthur Zamarin
2025-09-03 4:35 Ionen Wolkens
2025-08-30 13:43 Ionen Wolkens
2025-07-30 17:06 Arthur Zamarin
2025-07-30 17:06 Arthur Zamarin
2025-07-05 16:04 Ionen Wolkens
2025-07-05 16:04 Ionen Wolkens
2025-06-30 8:23 Sam James
2025-06-30 8:23 Sam James
2025-06-10 13:03 Ionen Wolkens
2025-06-05 5:33 Ionen Wolkens
2025-05-12 1:46 Ionen Wolkens
2025-04-27 12:57 Sam James
2025-04-27 11:28 Sam James
2025-04-07 15:05 Ionen Wolkens
2025-04-02 9:28 Arthur Zamarin
2025-04-02 9:28 Arthur Zamarin
2025-03-13 22:10 Ionen Wolkens
2025-03-09 14:41 Ionen Wolkens
2025-02-14 8:00 Ionen Wolkens
2025-02-14 8:00 Ionen Wolkens
2025-02-05 14:10 Jakov Smolić
2025-02-05 11:27 Sam James
2025-01-22 9:55 Ionen Wolkens
2025-01-13 16:16 Ionen Wolkens
2024-12-31 23:51 Ionen Wolkens
2024-12-31 12:47 Sam James
2024-12-31 9:57 Sam James
2024-12-20 16:14 Ionen Wolkens
2024-12-10 18:53 Sam James
2024-12-10 14:37 Arthur Zamarin
2024-12-10 9:53 Ionen Wolkens
2024-11-18 12:07 Ionen Wolkens
2024-11-11 23:22 Ionen Wolkens
2024-11-11 23:22 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-10-16 7:41 Sam James
2024-10-16 7:41 Sam James
2024-09-26 23:05 Ionen Wolkens
2024-07-30 18:00 Arthur Zamarin
2024-07-30 18:00 Arthur Zamarin
2024-07-10 12:18 Ionen Wolkens
2024-05-22 3:32 Ionen Wolkens
2024-05-21 3:01 Ionen Wolkens
2024-05-10 4:26 Ionen Wolkens
2024-05-07 14:28 Ionen Wolkens
2024-04-27 21:46 Sam James
2024-04-27 21:46 Sam James
2024-03-28 10:10 Ionen Wolkens
2024-03-27 16:45 Ionen Wolkens
2024-03-24 18:39 Ionen Wolkens
2024-03-20 13:37 Ionen Wolkens
2024-03-20 13:37 Ionen Wolkens
2024-03-20 7:17 Ionen Wolkens
2024-02-09 16:18 Ionen Wolkens
2024-02-09 16:18 Ionen Wolkens
2023-10-01 13:35 Sam James
2023-10-01 13:35 Sam James
2023-09-04 17:12 Ionen Wolkens
2023-08-16 21:38 Ionen Wolkens
2023-08-15 20:22 Ionen Wolkens
2023-08-10 10:53 Ionen Wolkens
2023-06-26 10:12 Ionen Wolkens
2023-06-08 12:24 Arthur Zamarin
2023-06-08 12:23 Arthur Zamarin
2023-06-02 6:54 Ionen Wolkens
2023-05-25 4:16 Ionen Wolkens
2023-05-12 11:59 Ionen Wolkens
2023-05-12 11:59 Ionen Wolkens
2023-04-17 20:44 Ionen Wolkens
2023-02-13 11:46 Ionen Wolkens
2023-01-24 21:40 Ionen Wolkens
2023-01-24 21:40 Ionen Wolkens
2022-12-15 21:32 Ionen Wolkens
2022-12-14 16:56 Ionen Wolkens
2022-11-29 15:02 Ionen Wolkens
2022-11-29 13:25 Ionen Wolkens
2022-11-29 12:13 Ionen Wolkens
2022-11-10 23:50 Ionen Wolkens
2022-11-10 23:50 Ionen Wolkens
2022-11-10 23:50 Ionen Wolkens
2022-10-31 0:54 Ionen Wolkens
2022-10-23 7:20 Ionen Wolkens
2022-09-27 23:46 Ionen Wolkens
2022-09-14 23:11 Ionen Wolkens
2022-09-01 0:34 Ionen Wolkens
2022-08-02 15:37 Ionen Wolkens
2022-07-16 17:03 Ionen Wolkens
2022-07-13 14:44 Ionen Wolkens
2022-07-13 14:39 Ionen Wolkens
2022-06-28 7:46 Ionen Wolkens
2022-05-17 4:21 Ionen Wolkens
2022-05-14 2:23 Ionen Wolkens
2022-05-13 2:48 Ionen Wolkens
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=1682761359.fca841ad33dbb0e5c6cd29950331b30ab2364d8d.ionen@gentoo \
--to=ionen@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