From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 308D615807A for ; Sun, 08 Jun 2025 12:03:44 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 17B0A343152 for ; Sun, 08 Jun 2025 12:03:44 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5CB691103C1; Sun, 08 Jun 2025 12:03:39 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4EF811103C1 for ; Sun, 08 Jun 2025 12:03:39 +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 07AD33430DD for ; Sun, 08 Jun 2025 12:03:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74ACE295A for ; Sun, 08 Jun 2025 12:03:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1749384170.8518239ce8b650b9792d128c5bb96cc6e36d694f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/wine.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8518239ce8b650b9792d128c5bb96cc6e36d694f X-VCS-Branch: master Date: Sun, 08 Jun 2025 12:03:37 +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: 862176ac-b983-4461-a996-299613fbaba6 X-Archives-Hash: c39d6c8a5dd3fbe3524a4e88c2c6559f commit: 8518239ce8b650b9792d128c5bb96cc6e36d694f Author: Sasha Finkelstein gmail com> AuthorDate: Thu May 1 12:42:48 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 8 12:02:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8518239c wine.eclass: Install xtajit.dll if requested Signed-off-by: Sasha Finkelstein gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42493 Closes: https://github.com/gentoo/gentoo/pull/42493 Signed-off-by: Sam James gentoo.org> eclass/wine.eclass | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/eclass/wine.eclass b/eclass/wine.eclass index 6561e4019568..36d3b505f39a 100644 --- a/eclass/wine.eclass +++ b/eclass/wine.eclass @@ -50,6 +50,7 @@ REQUIRED_USE=" wow64? ( !arm64? ( abi_x86_64 !abi_x86_32 ) ) " +RDEPEND="arm64? ( wow64? ( app-emulation/fex-xtajit ) )" BDEPEND=" || ( sys-devel/binutils:* @@ -354,6 +355,10 @@ wine_src_install() { fi fi + use arm64 && use wow64 && + dosym -r /usr/lib/fex-xtajit/libwow64fex.dll \ + ${WINE_PREFIX}/wine/aarch64-windows/xtajit.dll + # delete unwanted files if requested, not done directly in ebuilds # given must be done after install and before wrappers if (( ${#WINE_SKIP_INSTALL[@]} )); then @@ -375,11 +380,11 @@ wine_src_install() { if use mingw; then : "$(usex arm64 aarch64 $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip)" find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec ${_} --strip-unneeded {} + + -type f -exec ${_} --strip-unneeded {} + else # llvm-strip errors on .a, and CHOST binutils strip could mangle find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(dll\|exe\)' \ - -exec llvm-strip --strip-unneeded {} + + -type f -exec llvm-strip --strip-unneeded {} + fi eend ${?} || die fi @@ -418,13 +423,6 @@ wine_pkg_postinst() { fi fi - if use arm64 && use wow64; then - ewarn - ewarn "${PN} does not include an x86 emulator, running x86 binaries" - ewarn "with USE=wow64 on arm64 requires manually setting up xtajit.dll" - ewarn "(not packaged) in the Wine prefix." - fi - eselect wine update --if-unset || die }