| 1 |
commit: 4a814d75f9321004b29d64e9e2a229f12cf1a041 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 02:10:48 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 02:21:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a814d75 |
| 7 |
|
| 8 |
app-emulation/vkd3d-proton: add bypass for crossdev checks / unset |
| 9 |
|
| 10 |
Unset is needed given CC is not expected to be a cross-compiler |
| 11 |
but, if users know what they are doing, leave a way (MINGW_BYPASS=1). |
| 12 |
|
| 13 |
If e.g. llvm-mingw is ever officially supported, may need a mingw |
| 14 |
eclass to juggle toolchains properly and instruct about them. |
| 15 |
|
| 16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 17 |
|
| 18 |
app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild | 6 +++--- |
| 19 |
app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild | 6 +++--- |
| 20 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild |
| 23 |
index 68245c3ef796..14ead4c9f1e1 100644 |
| 24 |
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild |
| 25 |
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild |
| 26 |
@@ -43,7 +43,7 @@ BDEPEND=" |
| 27 |
pkg_pretend() { |
| 28 |
[[ ${MERGE_TYPE} == binary ]] && return |
| 29 |
|
| 30 |
- if use crossdev-mingw; then |
| 31 |
+ if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then |
| 32 |
local tool=-w64-mingw32-g++ |
| 33 |
for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do |
| 34 |
if ! type -P ${tool} >/dev/null; then |
| 35 |
@@ -94,7 +94,7 @@ src_configure() { |
| 36 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 37 |
|
| 38 |
if [[ ${CHOST} != *-mingw* ]]; then |
| 39 |
- unset AR CC CXX STRIP WIDL # likely unusable unless CHOST is mingw |
| 40 |
+ [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL |
| 41 |
|
| 42 |
CHOST_amd64=x86_64-w64-mingw32 |
| 43 |
CHOST_x86=i686-w64-mingw32 |
| 44 |
@@ -113,7 +113,7 @@ src_configure() { |
| 45 |
multilib_src_configure() { |
| 46 |
# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev, |
| 47 |
# unset again so meson eclass will set ${CHOST}-gcc + others |
| 48 |
- use crossdev-mingw && unset AR CC CXX STRIP WIDL |
| 49 |
+ use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL |
| 50 |
|
| 51 |
# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if |
| 52 |
# possible, but eclasses don't handle that so setup machine files |
| 53 |
|
| 54 |
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild |
| 55 |
index 68245c3ef796..14ead4c9f1e1 100644 |
| 56 |
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild |
| 57 |
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild |
| 58 |
@@ -43,7 +43,7 @@ BDEPEND=" |
| 59 |
pkg_pretend() { |
| 60 |
[[ ${MERGE_TYPE} == binary ]] && return |
| 61 |
|
| 62 |
- if use crossdev-mingw; then |
| 63 |
+ if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then |
| 64 |
local tool=-w64-mingw32-g++ |
| 65 |
for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do |
| 66 |
if ! type -P ${tool} >/dev/null; then |
| 67 |
@@ -94,7 +94,7 @@ src_configure() { |
| 68 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 69 |
|
| 70 |
if [[ ${CHOST} != *-mingw* ]]; then |
| 71 |
- unset AR CC CXX STRIP WIDL # likely unusable unless CHOST is mingw |
| 72 |
+ [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL |
| 73 |
|
| 74 |
CHOST_amd64=x86_64-w64-mingw32 |
| 75 |
CHOST_x86=i686-w64-mingw32 |
| 76 |
@@ -113,7 +113,7 @@ src_configure() { |
| 77 |
multilib_src_configure() { |
| 78 |
# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev, |
| 79 |
# unset again so meson eclass will set ${CHOST}-gcc + others |
| 80 |
- use crossdev-mingw && unset AR CC CXX STRIP WIDL |
| 81 |
+ use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL |
| 82 |
|
| 83 |
# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if |
| 84 |
# possible, but eclasses don't handle that so setup machine files |
Archives