commit:     dbc7d52d0a8d8559d11eb3b9f708775c7c6eaec0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 22:29:30 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 23:10:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc7d52d

app-emulation/wine-staging: filter ssp for mingw

Bug: https://bugs.gentoo.org/870136
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/wine-staging/wine-staging-7.17.ebuild | 4 +++-
 app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-7.17.ebuild 
b/app-emulation/wine-staging/wine-staging-7.17.ebuild
index 945a246e3988..c8a8a5c9d77f 100644
--- a/app-emulation/wine-staging/wine-staging-7.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.17.ebuild
@@ -277,7 +277,9 @@ src_configure() {
 
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                if use mingw; then
-                       : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC 
${CFLAGS:--O2})}"
+                       : "${CROSSCFLAGS:=$(
+                               filter-flags '-fstack-protector*' #870136
+                               CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'
                                CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 945a246e3988..c8a8a5c9d77f 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -277,7 +277,9 @@ src_configure() {
 
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                if use mingw; then
-                       : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC 
${CFLAGS:--O2})}"
+                       : "${CROSSCFLAGS:=$(
+                               filter-flags '-fstack-protector*' #870136
+                               CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'
                                CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"

Reply via email to