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 BD569158041 for ; Sun, 24 Mar 2024 18:39:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4C53E2A3C; Sun, 24 Mar 2024 18:39:32 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2BA9E2A3C for ; Sun, 24 Mar 2024 18:39:32 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4B8534307B for ; Sun, 24 Mar 2024 18:39:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FBE315E8 for ; Sun, 24 Mar 2024 18:39:28 +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: <1711305455.f96312e128119688fc59d2f8b34f362c4546ff3d.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: f96312e128119688fc59d2f8b34f362c4546ff3d X-VCS-Branch: master Date: Sun, 24 Mar 2024 18:39:28 +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: f4b2290c-f0bc-421c-a942-a364d4804e16 X-Archives-Hash: b053c462bc8f9e884ad7107328d63776 commit: f96312e128119688fc59d2f8b34f362c4546ff3d Author: Ionen Wolkens gentoo org> AuthorDate: Sun Mar 24 18:26:51 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Mar 24 18:37:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96312e1 app-emulation/wine-vanilla: filter -Wl,-z,* ... for CFLAGS test-flags-CC was not meant to test LDFLAGS and -Wl,* are no-ops at compile-time and thus don't get stripped even if they don't work (same happens when using strip-unsupported-flags) and then if a package compiles and links anything at same time it fails. This used not to be a big problem but now that 23.0 profiles do -Wl,-z,pack-relative-relocs (mingw ld has no -z) this is hitting bashrc-mv users that tend to do CFLAGS="${LDFLAGS}" by default. Tempting to ignore it because of how wrong it is, but well. An alternate route could be to eventually have strip-flags and/or strip-unsupported-flags remove -Wl,* from non-LDFLAGS given this could affect more than mingw (e.g. switching to bfd when there is a lld-only option). Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 5 +++++ app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 5 +++++ app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild | 6 ++++++ app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild | 6 ++++++ app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild | 6 ++++++ app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild | 6 ++++++ app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 6 ++++++ 7 files changed, 40 insertions(+) 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 bc8a900aa368..ed678fefaa02 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -295,6 +295,11 @@ src_configure() { filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + # -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 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 6ac6557b4934..972a6b64c743 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -297,6 +297,11 @@ src_configure() { filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + # -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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild index f1ae8dd30d38..7326ea74dd64 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild @@ -306,6 +306,12 @@ src_configure() { CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} )}" diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild index 593d2fed1eee..162e8b9a993c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.3.ebuild @@ -306,6 +306,12 @@ src_configure() { CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} )}" diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild index 358e42dfad4e..559d137dd799 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.4.ebuild @@ -307,6 +307,12 @@ src_configure() { CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} )}" diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild index 593d2fed1eee..162e8b9a993c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild @@ -306,6 +306,12 @@ src_configure() { CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + 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 593d2fed1eee..162e8b9a993c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -306,6 +306,12 @@ src_configure() { CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 + + # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then + # strip-unsupported-flags miss these during compile-only tests + # (primarily done for 23.0 profiles' -z, not full coverage) + filter-flags '-Wl,-z,*' + CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} )}"