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 B716E158090 for ; Fri, 20 May 2022 20:02:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03DEEE09E0; Fri, 20 May 2022 20:02:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 DDFC5E09E0 for ; Fri, 20 May 2022 20:02:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C62863416CE for ; Fri, 20 May 2022 20:02:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EFA63BF for ; Fri, 20 May 2022 20:02:02 +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: <1653076906.d59f05977cf91d0873b7a91a84c2811ae60302ff.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-6.0.2.ebuild app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild app-emulation/wine-vanilla/wine-vanilla-7.8.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: d59f05977cf91d0873b7a91a84c2811ae60302ff X-VCS-Branch: master Date: Fri, 20 May 2022 20:02:02 +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: a3864cec-750c-4f84-ae85-37a5478ca27f X-Archives-Hash: 9a8539c71fc601d86651250a99114c41 commit: d59f05977cf91d0873b7a91a84c2811ae60302ff Author: Ionen Wolkens gentoo org> AuthorDate: Wed May 18 02:35:09 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri May 20 20:01:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59f0597 app-emulation/wine-vanilla: improve cross *FLAGS handling Given wine will switch compiler, need to ensure unsupported flags were stripped so that e.g. clang-specific flags won't cause a build failure. strip-unsupported-flags doesn't act on CROSSCFLAGS, so use test-* directly. Using := assignment so that users can override. Additionally allowing LDFLAGS, there's not much to gain from it but as long as unsupported is stripped it should cause no issues. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild | 6 +++++- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 6 +++++- 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild index 9810db168765..807ee258f16e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild @@ -305,7 +305,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${EPREFIX}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild index 1992efdf9908..65ad27032112 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild @@ -296,7 +296,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild index 74051ef469f0..d1b64ae6c268 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild @@ -295,7 +295,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${EPREFIX}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild index e6242d06fb43..0d667bb08b98 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild @@ -297,7 +297,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild index b0609a8bff36..c097218912e6 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild @@ -296,7 +296,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild index b0609a8bff36..c097218912e6 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild @@ -296,7 +296,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild index 25c7af87ecba..6793bf6d1852 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild @@ -294,7 +294,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 25c7af87ecba..6793bf6d1852 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -294,7 +294,11 @@ src_configure() { if use mingw; then use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - export CROSSCFLAGS="${CFLAGS}" + # 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})}" + export CROSS{C,LD}FLAGS fi multilib-minimal_src_configure