commit:     9bef96cec566f1e06f5e9c40e52785b7b9702afa
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 09:06:08 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=9bef96ce

app-emulation/wine-vanilla: 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-vanilla/wine-vanilla-7.0.2.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild   | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild    | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild    | 2 +-
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

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 fe54aab83894..4d829d97e488 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -271,7 +271,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-vanilla/wine-vanilla-8.0.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
index 6aa6458e6edd..d5628d792348 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@@ -273,7 +273,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-vanilla/wine-vanilla-8.0.2.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 4603de37abfd..0731f2e45161 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -273,7 +273,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-vanilla/wine-vanilla-8.11-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
index 11ed198a2f98..fa39aa0fc4f2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
@@ -277,7 +277,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-vanilla/wine-vanilla-8.12.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
index 11ed198a2f98..fa39aa0fc4f2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
@@ -277,7 +277,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-vanilla/wine-vanilla-8.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index a8e5b1d37232..54c3aae2b8c1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -275,7 +275,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-vanilla/wine-vanilla-9999.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index a8e5b1d37232..54c3aae2b8c1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -275,7 +275,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