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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CD4215801B for ; Fri, 11 Aug 2023 10:52:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87D3D2BC033; Fri, 11 Aug 2023 10:52:37 +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 68F912BC033 for ; Fri, 11 Aug 2023 10:52:36 +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 962B533BEBE for ; Fri, 11 Aug 2023 10:52:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2BBFF5C for ; Fri, 11 Aug 2023 10:52:33 +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: <1691748007.b15be1cefe3f1288144bf23d5251e45a0428faa5.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-proton/wine-proton-8.0.3c.ebuild app-emulation/wine-proton/wine-proton-8.0.9999.ebuild X-VCS-Directories: app-emulation/wine-proton/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b15be1cefe3f1288144bf23d5251e45a0428faa5 X-VCS-Branch: master Date: Fri, 11 Aug 2023 10:52:33 +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: a64d6f7a-bd91-4a9b-8bc7-78eabdb22c9d X-Archives-Hash: ef0365883e34ba48596c912dc5999b3f commit: b15be1cefe3f1288144bf23d5251e45a0428faa5 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Aug 11 07:32:48 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Aug 11 10:00:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15be1ce app-emulation/wine-proton: pass -latomic with clang for ntdll.so Specific to Valve's fync patches, aka: ntdll/unix/fsync.c:368: undefined reference to `__atomic_load_8' Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-proton/wine-proton-8.0.3c.ebuild | 5 +++++ app-emulation/wine-proton/wine-proton-8.0.9999.ebuild | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild index 79fa39b47160..cad46d367304 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild @@ -60,8 +60,10 @@ WINE_DLOPEN_DEPEND=" v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" +# gcc: for -latomic with clang WINE_COMMON_DEPEND=" ${WINE_DLOPEN_DEPEND} + sys-devel/gcc:* x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) @@ -154,6 +156,9 @@ src_prepare() { # and it still gets used in install phase despite --with-mingw, # drop as a quick fix for now which hopefully should be safe sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die + + # needed by Valve's fsync patches if using clang (undef atomic_load_8) + sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in || die fi # ensure .desktop calls this variant + slot diff --git a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild index 264e3ea19172..248c24788eab 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild @@ -60,8 +60,10 @@ WINE_DLOPEN_DEPEND=" v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" +# gcc: for -latomic with clang WINE_COMMON_DEPEND=" ${WINE_DLOPEN_DEPEND} + sys-devel/gcc:* x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) @@ -154,6 +156,9 @@ src_prepare() { # and it still gets used in install phase despite --with-mingw, # drop as a quick fix for now which hopefully should be safe sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die + + # needed by Valve's fsync patches if using clang (undef atomic_load_8) + sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in || die fi # ensure .desktop calls this variant + slot