commit: 70b13c64ef94d1a6761b6d7324af66f3e38192c0 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Aug 14 10:22:24 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Aug 14 10:25:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b13c64
app-emulation/wine-staging: pass -mno-avx with mingw unconditionally Upon further consideration 20894379a00ea6f482884d4159217ce3b1bc21a2 result in rather unexpected behavior even if we consider that USE=custom-cflags is unsupported, and giving a way to skip -mno-avx may not be all that worth it. So revert plus tidy and add this bugref. Closes: https://bugs.gentoo.org/912268 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/wine-staging/wine-staging-8.0.ebuild | 7 +++++-- app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-8.12.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-8.13.ebuild | 2 +- app-emulation/wine-staging/wine-staging-9999.ebuild | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild index 02e21b401e18..913b48dd933e 100644 --- a/app-emulation/wine-staging/wine-staging-8.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild @@ -314,14 +314,17 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported : "${CROSSCFLAGS:=$( # >=wine-7.21 configure.ac no longer adds -fno-strict by mistake - append-cflags '-fno-strict-aliasing' + append-cflags -fno-strict-aliasing + filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + # -mavx with mingw-gcc has a history of obscure issues and # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` # crashes with -march=skylake >=wine-8.10, similar issues with # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - use custom-cflags || append-cflags -mno-avx + append-cflags -mno-avx #912268 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild index 3de52318a359..099bf613a54c 100644 --- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild @@ -329,11 +329,13 @@ src_configure() { : "${CROSSCFLAGS:=$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + # -mavx with mingw-gcc has a history of obscure issues and # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` # crashes with -march=skylake >=wine-8.10, similar issues with # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - use custom-cflags || append-cflags -mno-avx + append-cflags -mno-avx #912268 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild b/app-emulation/wine-staging/wine-staging-8.12.ebuild index 3de52318a359..099bf613a54c 100644 --- a/app-emulation/wine-staging/wine-staging-8.12.ebuild +++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild @@ -329,11 +329,13 @@ src_configure() { : "${CROSSCFLAGS:=$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + # -mavx with mingw-gcc has a history of obscure issues and # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` # crashes with -march=skylake >=wine-8.10, similar issues with # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - use custom-cflags || append-cflags -mno-avx + append-cflags -mno-avx #912268 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild b/app-emulation/wine-staging/wine-staging-8.13.ebuild index beaa12265098..9f7c5dfd6147 100644 --- a/app-emulation/wine-staging/wine-staging-8.13.ebuild +++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild @@ -337,7 +337,7 @@ src_configure() { # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` # crashes with -march=skylake >=wine-8.10, similar issues with # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - use custom-cflags || append-cflags -mno-avx + append-cflags -mno-avx #912268 CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} )}" diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index beaa12265098..9f7c5dfd6147 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -337,7 +337,7 @@ src_configure() { # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` # crashes with -march=skylake >=wine-8.10, similar issues with # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - use custom-cflags || append-cflags -mno-avx + append-cflags -mno-avx #912268 CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} )}"
