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 6E7C2158012 for ; Tue, 13 Sep 2022 04:19:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29C70E0893; Tue, 13 Sep 2022 04:19:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 0C2ACE0893 for ; Tue, 13 Sep 2022 04:19:15 +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 2E779340DA5 for ; Tue, 13 Sep 2022 04:19:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B3365D0 for ; Tue, 13 Sep 2022 04:19:12 +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: <1663042666.708a61dd148c0664366c35b8a471f84bc8e92cfc.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/, app-emulation/wine-staging/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/files/wine-staging-7.17-llvm-libunwind.patch app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch app-emulation/wine-staging/wine-staging-7.17.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ app-emulation/wine-staging/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 708a61dd148c0664366c35b8a471f84bc8e92cfc X-VCS-Branch: master Date: Tue, 13 Sep 2022 04:19:12 +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: 1fc7b4e6-1b11-41ba-bc81-4cbab0644cce X-Archives-Hash: d1b8a6e1f00abd76812f9a9ba513b810 commit: 708a61dd148c0664366c35b8a471f84bc8e92cfc Author: Ionen Wolkens gentoo org> AuthorDate: Tue Sep 13 01:49:19 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Sep 13 04:17:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708a61dd app-emulation/wine-staging: fix clang + USE=-llvm-libunwind build _Unwind_Find_FDE doesn't exist in libunwind but does in gcc's rtlib, clang instead expects it from llvm-libunwind which leads to undefined references even with USE=-unwind. Messy but add extra guards around it. Signed-off-by: Ionen Wolkens gentoo.org> .../files/wine-staging-7.17-llvm-libunwind.patch | 9 ----- .../files/wine-staging-7.17-unwind.patch | 40 ++++++++++++++++++++++ .../wine-staging/wine-staging-7.17.ebuild | 2 +- .../wine-staging/wine-staging-9999.ebuild | 2 +- 4 files changed, 42 insertions(+), 11 deletions(-) diff --git a/app-emulation/wine-staging/files/wine-staging-7.17-llvm-libunwind.patch b/app-emulation/wine-staging/files/wine-staging-7.17-llvm-libunwind.patch deleted file mode 100644 index a7f8772ab5c4..000000000000 --- a/app-emulation/wine-staging/files/wine-staging-7.17-llvm-libunwind.patch +++ /dev/null @@ -1,9 +0,0 @@ -Note the dodgy _CONFIG_H_ check can be removed when >=llvm-libunwind-15 -(which adds _VERSION) is well established: https://reviews.llvm.org/D121015 ---- a/dlls/ntdll/unix/signal_x86_64.c -+++ b/dlls/ntdll/unix/signal_x86_64.c -@@ -1458,3 +1458,3 @@ - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) - rc = unw_getcontext( &unw_context ); diff --git a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch b/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch new file mode 100644 index 000000000000..52512ca82968 --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch @@ -0,0 +1,40 @@ +Fix build with llvm-libunwind, and also fix for non-llvm libunwind +when using clang+bfd given clang doesn't have _Unwind_Find_FDE in +its rtlib and expects it from llvm-libunwind. + +The _CONFIG_H_ check is for Rip - 1), &bases ); + + if (fde) + return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde, + &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); ++#endif + #ifdef HAVE_LIBUNWIND + return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, + &dispatch->LanguageHandler, &dispatch->HandlerData ); diff --git a/app-emulation/wine-staging/wine-staging-7.17.ebuild b/app-emulation/wine-staging/wine-staging-7.17.ebuild index 8b3f0ce65d88..945a246e3988 100644 --- a/app-emulation/wine-staging/wine-staging-7.17.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.17.ebuild @@ -126,8 +126,8 @@ IDEPEND="app-eselect/eselect-wine" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( - "${FILESDIR}"/${PN}-7.17-llvm-libunwind.patch "${FILESDIR}"/${PN}-7.17-noexecstack.patch + "${FILESDIR}"/${PN}-7.17-unwind.patch ) pkg_pretend() { diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 8b3f0ce65d88..945a246e3988 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -126,8 +126,8 @@ IDEPEND="app-eselect/eselect-wine" QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( - "${FILESDIR}"/${PN}-7.17-llvm-libunwind.patch "${FILESDIR}"/${PN}-7.17-noexecstack.patch + "${FILESDIR}"/${PN}-7.17-unwind.patch ) pkg_pretend() {