Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/
Date: Wed, 14 Sep 2022 23:11:10
Message-Id: 1663197017.dbc7d52d0a8d8559d11eb3b9f708775c7c6eaec0.ionen@gentoo
1 commit: dbc7d52d0a8d8559d11eb3b9f708775c7c6eaec0
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 14 22:29:30 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 14 23:10:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc7d52d
7
8 app-emulation/wine-staging: filter ssp for mingw
9
10 Bug: https://bugs.gentoo.org/870136
11 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
12
13 app-emulation/wine-staging/wine-staging-7.17.ebuild | 4 +++-
14 app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++-
15 2 files changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/app-emulation/wine-staging/wine-staging-7.17.ebuild b/app-emulation/wine-staging/wine-staging-7.17.ebuild
18 index 945a246e3988..c8a8a5c9d77f 100644
19 --- a/app-emulation/wine-staging/wine-staging-7.17.ebuild
20 +++ b/app-emulation/wine-staging/wine-staging-7.17.ebuild
21 @@ -277,7 +277,9 @@ src_configure() {
22
23 # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
24 if use mingw; then
25 - : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
26 + : "${CROSSCFLAGS:=$(
27 + filter-flags '-fstack-protector*' #870136
28 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
29 : "${CROSSLDFLAGS:=$(
30 filter-flags '-fuse-ld=*'
31 CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
32
33 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
34 index 945a246e3988..c8a8a5c9d77f 100644
35 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
36 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
37 @@ -277,7 +277,9 @@ src_configure() {
38
39 # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
40 if use mingw; then
41 - : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
42 + : "${CROSSCFLAGS:=$(
43 + filter-flags '-fstack-protector*' #870136
44 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
45 : "${CROSSLDFLAGS:=$(
46 filter-flags '-fuse-ld=*'
47 CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"