commit:     7151cb7165bc6e22ae5b1eb968e626cdd734e30e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 22:29:36 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=7151cb71

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

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

 app-emulation/wine-proton/wine-proton-7.0.4.ebuild    | 4 +++-
 app-emulation/wine-proton/wine-proton-7.0.9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild
index 4d1b0a1aa939..069df0440aa8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild
@@ -242,7 +242,9 @@ src_configure() {
                : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
 
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               : "${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-proton/wine-proton-7.0.9999.ebuild 
b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
index 0df6fada339d..3e08621d9527 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
@@ -242,7 +242,9 @@ src_configure() {
                : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
 
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
-               : "${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