From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15A0215800A for ; Mon, 14 Aug 2023 10:26:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57ED02BC028; Mon, 14 Aug 2023 10:26:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40F882BC025 for ; Mon, 14 Aug 2023 10:26:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60194335CFF for ; Mon, 14 Aug 2023 10:26:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A41E1F89 for ; Mon, 14 Aug 2023 10:26:51 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1692008746.70b13c64ef94d1a6761b6d7324af66f3e38192c0.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/wine-staging-8.0.ebuild app-emulation/wine-staging/wine-staging-8.11-r1.ebuild app-emulation/wine-staging/wine-staging-8.12.ebuild app-emulation/wine-staging/wine-staging-8.13.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 70b13c64ef94d1a6761b6d7324af66f3e38192c0 X-VCS-Branch: master Date: Mon, 14 Aug 2023 10:26:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c76259f4-3705-4fe7-9dd2-fd44184a119e X-Archives-Hash: 4f2594cb41a08da150afaefde968f919 commit: 70b13c64ef94d1a6761b6d7324af66f3e38192c0 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Aug 14 10:22:24 2023 +0000 Commit: Ionen Wolkens gentoo 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 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} )}"