commit:     b4e5ef8fe7a9ce61c9177d1b107a329e6ac53872
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 09:28:06 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=b4e5ef8f

app-emulation/wine-vanilla: remove obsolete clash-protection filter

ICE was fixed (bug #758914), if still run into this then updating
gcc to a newer _p* snapshot should sort it (alternatively, use
released >=gcc-13.1.0).

Note that -fstack-protector* (bug #870136) is still needed, while
mingw64-runtime-11.0.0 add some degree of support, it still seems
to fail for Wine itself.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild | 1 -
 app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 1 -
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild | 1 -
 app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild   | 1 -
 app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild   | 1 -
 app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild   | 1 -
 app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild   | 1 -
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild  | 1 -
 8 files changed, 8 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index fe61b00a0b55..df0b0a5acf85 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -260,7 +260,6 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                if use mingw; then
                        : "${CROSSCFLAGS:=$(
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 87cd1e61cd65..b598b2d226b2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -260,7 +260,6 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                if use mingw; then
                        : "${CROSSCFLAGS:=$(
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
index 44ecd77a00df..8324d426aadb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@@ -262,7 +262,6 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
                                append-cflags '-fno-strict-aliasing'
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
index e12c775a10d0..2d1ceabcfd5b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
@@ -262,7 +262,6 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
                                append-cflags '-fno-strict-aliasing'
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild
index 69a8a4af667a..d31d47a75832 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.5.ebuild
@@ -267,7 +267,6 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
                                append-cflags '-fno-strict-aliasing'
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
index f0ab1e9a0897..12a5764467f8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
@@ -267,7 +267,6 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
                                append-cflags '-fno-strict-aliasing'
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
index 1a71740166ff..9d33f21d9645 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
@@ -268,7 +268,6 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
                                append-cflags '-fno-strict-aliasing'
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 1a71740166ff..9d33f21d9645 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -268,7 +268,6 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                # >=wine-7.21 configure.ac no longer adds 
-fno-strict by mistake
                                append-cflags '-fno-strict-aliasing'
-                               filter-flags '-fstack-clash-protection' #758914
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"

Reply via email to