commit:     8d751cdfe6acd97b394448df4bf9f2b9d0fd4261
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 00:44:34 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 00:47:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d751cdf

app-emulation/wine-vanilla: filter -mfunction-return=thunk for mingw

Unfortunately mingw doesn't play well with many security/mitigation
flags. May need to consider a mingw.eclass if keep adding more of
these to every ebuilds using it.

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

 app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild | 1 +
 app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild   | 1 +
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
index 3ec318d2b900..400fb26b9bf0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild
@@ -248,6 +248,7 @@ src_configure() {
                        : "${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})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild
index 4ad3720b207d..2543258da0e2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild
@@ -246,6 +246,7 @@ src_configure() {
                        : "${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})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
index 4ad3720b207d..2543258da0e2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.18.ebuild
@@ -246,6 +246,7 @@ src_configure() {
                        : "${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})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
index 4ad3720b207d..2543258da0e2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
@@ -246,6 +246,7 @@ src_configure() {
                        : "${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})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 182a3b611155..abf112c22c23 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -246,6 +246,7 @@ src_configure() {
                        : "${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})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

Reply via email to