From c4004bd85cebc85bca29db421dfb1815436c9d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 28 Nov 2022 22:35:05 +0700 Subject: [PATCH] openmw: patch for glibc 2.34 --- srcpkgs/openmw/patches/glibc-2.34.patch | 36 +++++++++++++++++++++++++ srcpkgs/openmw/template | 3 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/openmw/patches/glibc-2.34.patch diff --git a/srcpkgs/openmw/patches/glibc-2.34.patch b/srcpkgs/openmw/patches/glibc-2.34.patch new file mode 100644 index 00000000000..552f36ee1cb --- /dev/null +++ b/srcpkgs/openmw/patches/glibc-2.34.patch @@ -0,0 +1,36 @@ +From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001 +From: elsid +Date: Fri, 24 Sep 2021 19:40:29 +0200 +Subject: [PATCH] Assume SIGSTKSZ is not a constant + +SIGSTKSZ is not defined as constant since glibc 2.34: +https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53 +--- + components/crashcatcher/crashcatcher.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp +index 86571e1e3af..c828e1ca816 100644 +--- a/components/crashcatcher/crashcatcher.cpp ++++ b/components/crashcatcher/crashcatcher.cpp +@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n"; + + static char argv0[PATH_MAX]; + +-static char altstack[SIGSTKSZ]; +- + + static struct { + int signum; +@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig + + /* Set an alternate signal stack so SIGSEGVs caused by stack overflows + * still run */ ++ static char* altstack = new char [SIGSTKSZ]; + altss.ss_sp = altstack; + altss.ss_flags = 0; +- altss.ss_size = sizeof(altstack); ++ altss.ss_size = SIGSTKSZ; + sigaltstack(&altss, nullptr); + + memset(&sa, 0, sizeof(sa)); diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 802e1dfc996..8940e4c4367 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -24,7 +24,8 @@ if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - broken="https://build.voidlinux.org/builders/armv6l_builder/builds/26346/steps/shell_3/logs/stdio" + makedepends+=" libatomic-devel" + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi openmw-cs_package() {