commit:     0198811d44b0014d1b04033c835e788163b782fb
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 11:19:53 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 11:23:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0198811d

wine.eclass: require lld w/ wow64 w/o mingw, drop clang[abi_x86_32]

Wine forces -fuse-ld=lld with -target *-windows.

clang[${WINE_USEDEP}] was kind of copied from mingw64-toolchain
but makes no sense here, afaik this is just for libclang which
we do not need. It's possible need some abi_x86_32 on some other
llvm-runtimes/* or clang-runtime (untested), but given wine
provides its own runtimes that sounds unlikely (our packages
aren't for windows).

Not closing bug #954211 given cause hasn't been confirmed yet.

While here also deduplicate the mingw64-toolchain dep with !wow64.

Bug: https://bugs.gentoo.org/954211
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 eclass/wine.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/wine.eclass b/eclass/wine.eclass
index b82dd469c191..cb4852b99c60 100644
--- a/eclass/wine.eclass
+++ b/eclass/wine.eclass
@@ -57,12 +57,13 @@ BDEPEND="
        dev-lang/perl
        mingw? (
                !crossdev-mingw? (
-                       dev-util/mingw64-toolchain[${WINE_USEDEP}]
                        wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+                       !wow64? ( dev-util/mingw64-toolchain[${WINE_USEDEP}] )
                )
        )
        !mingw? (
-               llvm-core/clang:*[${WINE_USEDEP}]
+               llvm-core/clang:*
+               llvm-core/lld:*
                strip? ( llvm-core/llvm:* )
        )
 "

Reply via email to