From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1396094-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 38778158090 for <garchives@archives.gentoo.org>; Sat, 14 May 2022 02:23:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9023E0874; Sat, 14 May 2022 02:23:44 +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 CD4FCE0874 for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2022 02:23:44 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75789341AFD for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2022 02:23:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7845C43D for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2022 02:23:41 +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: <1652494917.9905d05f9b9851c11bd2e0922b79df6f5db3033d.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/dxvk/dxvk-1.10.1.ebuild app-emulation/dxvk/dxvk-9999.ebuild X-VCS-Directories: app-emulation/dxvk/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 9905d05f9b9851c11bd2e0922b79df6f5db3033d X-VCS-Branch: master Date: Sat, 14 May 2022 02:23:41 +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: d556aaa6-d508-4120-949d-69fc240ccd5b X-Archives-Hash: eacfa76f6fd5fd71ecee3f5df599a6d0 commit: 9905d05f9b9851c11bd2e0922b79df6f5db3033d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat May 14 02:04:43 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat May 14 02:21:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9905d05f app-emulation/dxvk: add bypass for crossdev checks / unset Unset is needed given CC is not expected to be a cross-compiler but, if users know what they are doing, leave a way (MINGW_BYPASS=1). If e.g. llvm-mingw is ever officially supported, may need a mingw eclass to juggle toolchains properly and instruct about them. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/dxvk/dxvk-1.10.1.ebuild | 6 +++--- app-emulation/dxvk/dxvk-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild index d48b3cc7cc2a..7d293dd8f8ea 100644 --- a/app-emulation/dxvk/dxvk-1.10.1.ebuild +++ b/app-emulation/dxvk/dxvk-1.10.1.ebuild @@ -32,7 +32,7 @@ BDEPEND=" pkg_pretend() { [[ ${MERGE_TYPE} == binary ]] && return - if use crossdev-mingw; then + if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then local tool=-w64-mingw32-g++ for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do if ! type -P ${tool} >/dev/null; then @@ -64,7 +64,7 @@ src_configure() { append-flags -mno-avx if [[ ${CHOST} != *-mingw* ]]; then - unset AR CC CXX RC STRIP # likely unusable unless CHOST is mingw + [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP CHOST_amd64=x86_64-w64-mingw32 CHOST_x86=i686-w64-mingw32 @@ -79,7 +79,7 @@ src_configure() { multilib_src_configure() { # multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev, # unset again so meson eclass will set ${CHOST}-gcc + others - use crossdev-mingw && unset AR CC CXX RC STRIP + use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP local emesonargs=( --prefix="${EPREFIX}"/usr/lib/${PN} diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index d48b3cc7cc2a..7d293dd8f8ea 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -32,7 +32,7 @@ BDEPEND=" pkg_pretend() { [[ ${MERGE_TYPE} == binary ]] && return - if use crossdev-mingw; then + if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then local tool=-w64-mingw32-g++ for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do if ! type -P ${tool} >/dev/null; then @@ -64,7 +64,7 @@ src_configure() { append-flags -mno-avx if [[ ${CHOST} != *-mingw* ]]; then - unset AR CC CXX RC STRIP # likely unusable unless CHOST is mingw + [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP CHOST_amd64=x86_64-w64-mingw32 CHOST_x86=i686-w64-mingw32 @@ -79,7 +79,7 @@ src_configure() { multilib_src_configure() { # multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev, # unset again so meson eclass will set ${CHOST}-gcc + others - use crossdev-mingw && unset AR CC CXX RC STRIP + use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP local emesonargs=( --prefix="${EPREFIX}"/usr/lib/${PN}