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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE44C158090 for ; Sat, 14 May 2022 02:23:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9B8BE0839; Sat, 14 May 2022 02:23:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 903F8E0839 for ; Sat, 14 May 2022 02:23:44 +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 57446341AD3 for ; Sat, 14 May 2022 02:23:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E592452 for ; Sat, 14 May 2022 02:23:41 +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: <1652494918.4a814d75f9321004b29d64e9e2a229f12cf1a041.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild X-VCS-Directories: app-emulation/vkd3d-proton/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 4a814d75f9321004b29d64e9e2a229f12cf1a041 X-VCS-Branch: master Date: Sat, 14 May 2022 02:23:41 +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: b4feb836-d29e-4a0c-8338-c466e7919f31 X-Archives-Hash: 19f2f969338d8520d57bea2707c54f71 commit: 4a814d75f9321004b29d64e9e2a229f12cf1a041 Author: Ionen Wolkens gentoo org> AuthorDate: Sat May 14 02:10:48 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat May 14 02:21:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a814d75 app-emulation/vkd3d-proton: 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 gentoo.org> app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild | 6 +++--- app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild index 68245c3ef796..14ead4c9f1e1 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild @@ -43,7 +43,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 @@ -94,7 +94,7 @@ src_configure() { use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} if [[ ${CHOST} != *-mingw* ]]; then - unset AR CC CXX STRIP WIDL # likely unusable unless CHOST is mingw + [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL CHOST_amd64=x86_64-w64-mingw32 CHOST_x86=i686-w64-mingw32 @@ -113,7 +113,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 STRIP WIDL + use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL # prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if # possible, but eclasses don't handle that so setup machine files diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild index 68245c3ef796..14ead4c9f1e1 100644 --- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild +++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild @@ -43,7 +43,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 @@ -94,7 +94,7 @@ src_configure() { use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} if [[ ${CHOST} != *-mingw* ]]; then - unset AR CC CXX STRIP WIDL # likely unusable unless CHOST is mingw + [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL CHOST_amd64=x86_64-w64-mingw32 CHOST_x86=i686-w64-mingw32 @@ -113,7 +113,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 STRIP WIDL + use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL # prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if # possible, but eclasses don't handle that so setup machine files