From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1418907-garchives=archives.gentoo.org@lists.gentoo.org> 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 3731E158094 for <garchives@archives.gentoo.org>; Sat, 16 Jul 2022 17:04:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CB3EE0F90; Sat, 16 Jul 2022 17:04:00 +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 272F9E0F90 for <gentoo-commits@lists.gentoo.org>; Sat, 16 Jul 2022 17:04:00 +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 44CEC3410BF for <gentoo-commits@lists.gentoo.org>; Sat, 16 Jul 2022 17:03:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 699A7540 for <gentoo-commits@lists.gentoo.org>; Sat, 16 Jul 2022 17:03:56 +0000 (UTC) From: "Ionen Wolkens" <ionen@gentoo.org> 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" <ionen@gentoo.org> Message-ID: <1657990596.6e94547eb0078c45f11eaeae2038a05cf2346f7c.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-7.10.ebuild app-emulation/wine-staging/wine-staging-7.11.ebuild app-emulation/wine-staging/wine-staging-7.12.ebuild app-emulation/wine-staging/wine-staging-7.9.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: 6e94547eb0078c45f11eaeae2038a05cf2346f7c X-VCS-Branch: master Date: Sat, 16 Jul 2022 17:03:56 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee1c552a-97ba-4d4a-a578-7d3649e5cd1c X-Archives-Hash: d777a9520a250e007d853b7e40259916 commit: 6e94547eb0078c45f11eaeae2038a05cf2346f7c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Jul 16 15:41:00 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Jul 16 16:56:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e94547e app-emulation/wine-staging: filter -fuse-ld for mingw flag-o-matic is looking at respecting -fuse-ld for test-flags-CCLD, which is good but don't want this when doing the user-unexpected switch to mingw toolchain (filtering feels more solid either way). Users can use CROSSLDFLAGS directly if really need full control. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/wine-staging/wine-staging-7.10.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-7.11.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-7.12.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-7.9.ebuild | 4 +++- app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-7.10.ebuild b/app-emulation/wine-staging/wine-staging-7.10.ebuild index 9d69fea688ff..7c7e3938e005 100644 --- a/app-emulation/wine-staging/wine-staging-7.10.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.10.ebuild @@ -360,7 +360,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" export CROSS{C,LD}FLAGS fi diff --git a/app-emulation/wine-staging/wine-staging-7.11.ebuild b/app-emulation/wine-staging/wine-staging-7.11.ebuild index 9d69fea688ff..7c7e3938e005 100644 --- a/app-emulation/wine-staging/wine-staging-7.11.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.11.ebuild @@ -360,7 +360,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" export CROSS{C,LD}FLAGS fi diff --git a/app-emulation/wine-staging/wine-staging-7.12.ebuild b/app-emulation/wine-staging/wine-staging-7.12.ebuild index 9d69fea688ff..7c7e3938e005 100644 --- a/app-emulation/wine-staging/wine-staging-7.12.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.12.ebuild @@ -360,7 +360,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" export CROSS{C,LD}FLAGS fi diff --git a/app-emulation/wine-staging/wine-staging-7.9.ebuild b/app-emulation/wine-staging/wine-staging-7.9.ebuild index f4c0f73c2350..ba6a8611c8cc 100644 --- a/app-emulation/wine-staging/wine-staging-7.9.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.9.ebuild @@ -360,7 +360,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" export CROSS{C,LD}FLAGS fi diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 9d69fea688ff..7c7e3938e005 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -360,7 +360,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" export CROSS{C,LD}FLAGS fi