| 1 |
commit: ddc354f096fb5d32feb6df8af4a6e2f079edd178 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 6 14:20:08 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 6 14:48:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc354f0 |
| 7 |
|
| 8 |
app-emulation/wine-proton: fix musl build with >=linux-headers-5.16 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/868747 |
| 11 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 12 |
|
| 13 |
.../wine-proton/files/wine-proton-7.0.4-musl.patch | 17 +++++++++++++++++ |
| 14 |
app-emulation/wine-proton/wine-proton-7.0.4.ebuild | 1 + |
| 15 |
2 files changed, 18 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-musl.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-musl.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..0776df12f241 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-emulation/wine-proton/files/wine-proton-7.0.4-musl.patch |
| 22 |
@@ -0,0 +1,17 @@ |
| 23 |
+Wrongly assumes that futex_waitv is missing if no glibc-only __NR_futex_waitv. |
| 24 |
+https://bugs.gentoo.org/868747 |
| 25 |
+--- a/configure.ac |
| 26 |
++++ b/configure.ac |
| 27 |
+@@ -2153,2 +2153,5 @@ |
| 28 |
+ |
| 29 |
++dnl Check for futex_waitv structure members |
| 30 |
++AC_CHECK_MEMBERS(struct futex_waitv.val,,,[#include <linux/futex.h>]) |
| 31 |
++ |
| 32 |
+ dnl Check for socket structure members |
| 33 |
+--- a/dlls/ntdll/unix/fsync.c |
| 34 |
++++ b/dlls/ntdll/unix/fsync.c |
| 35 |
+@@ -67,2 +67,4 @@ |
| 36 |
+ # define __NR_futex_waitv 449 |
| 37 |
++#endif |
| 38 |
++#ifndef HAVE_STRUCT_FUTEX_WAITV_VAL |
| 39 |
+ # define FUTEX_32 2 |
| 40 |
|
| 41 |
diff --git a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild |
| 42 |
index b78eed8c93c6..b7bb3868a11a 100644 |
| 43 |
--- a/app-emulation/wine-proton/wine-proton-7.0.4.ebuild |
| 44 |
+++ b/app-emulation/wine-proton/wine-proton-7.0.4.ebuild |
| 45 |
@@ -95,6 +95,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
"${FILESDIR}"/${PN}-7.0.4-llvm-libunwind.patch |
| 49 |
+ "${FILESDIR}"/${PN}-7.0.4-musl.patch |
| 50 |
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch |
| 51 |
"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch |
| 52 |
) |
Archives