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 3A94415801B 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 72C502BC025; Mon, 14 Aug 2023 10:26:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 5594D2BC025 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 54E58335CF5 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 B8078F8A 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: <1692008747.44d2b75c2b8f8151d6d09e7dd2af4c6818e7b280.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-proton/wine-proton-7.0.6.ebuild app-emulation/wine-proton/wine-proton-8.0.3c.ebuild app-emulation/wine-proton/wine-proton-8.0.9999.ebuild X-VCS-Directories: app-emulation/wine-proton/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 44d2b75c2b8f8151d6d09e7dd2af4c6818e7b280 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: 563ad006-6a39-4b6e-94df-0ec297a55621 X-Archives-Hash: 12098e313087fea379441ec73f10ab3f commit: 44d2b75c2b8f8151d6d09e7dd2af4c6818e7b280 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Aug 14 10:22:41 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Aug 14 10:25:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d2b75c app-emulation/wine-proton: pass -mno-avx with mingw unconditionally Upon further consideration 84924628f0009acbe92b94ac28141c7ee322548e 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-proton/wine-proton-7.0.6.ebuild | 4 +++- app-emulation/wine-proton/wine-proton-8.0.3c.ebuild | 7 +++++-- app-emulation/wine-proton/wine-proton-8.0.9999.ebuild | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild index 95664cb0ff23..2d64d08da94f 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild @@ -269,11 +269,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-proton/wine-proton-8.0.3c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild index c5db812fe92b..28c682e79696 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild @@ -273,14 +273,17 @@ src_configure() { : "${CROSSCFLAGS:=$( # >=wine-7.21 <8.10's configure.ac does not pass -fno-strict when # it should (can be removed when proton is rebased on >=8.10) - 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-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild index 6c5e37bcd5bb..9c15f5e09995 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild @@ -277,14 +277,17 @@ src_configure() { : "${CROSSCFLAGS:=$( # >=wine-7.21 <8.10's configure.ac does not pass -fno-strict when # it should (can be removed when proton is rebased on >=8.10) - 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=*'