commit:     20894379a00ea6f482884d4159217ce3b1bc21a2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 09:08:22 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 10:35:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20894379

app-emulation/wine-staging: skip -mno-avx with USE=custom-cflags

Don't recommend it (even hardly recommend -march=native!), but
some users like ricing their wine and would rather not see this
if it "works for me".

Others like filter-lto stay regardless given that just will not
build.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild     | 2 +-
 app-emulation/wine-staging/wine-staging-8.11-r1.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-8.12.ebuild    | 2 +-
 app-emulation/wine-staging/wine-staging-8.13.ebuild    | 2 +-
 app-emulation/wine-staging/wine-staging-9999.ebuild    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index c8412919b5a8..3c90e7786184 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -305,7 +305,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
-                               append-cflags -mno-avx
+                               use custom-cflags || append-cflags -mno-avx
                                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 940bb93e3836..1c501de4a39c 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -318,7 +318,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
-                               append-cflags -mno-avx
+                               use custom-cflags || append-cflags -mno-avx
                                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 940bb93e3836..1c501de4a39c 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -318,7 +318,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
-                               append-cflags -mno-avx
+                               use custom-cflags || append-cflags -mno-avx
                                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 d2092db2b690..7af88917ad54 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -316,7 +316,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
-                               append-cflags -mno-avx
+                               use custom-cflags || append-cflags -mno-avx
 
                                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 d2092db2b690..7af88917ad54 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -316,7 +316,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
-                               append-cflags -mno-avx
+                               use custom-cflags || append-cflags -mno-avx
 
                                CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
                        )"

Reply via email to