[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/11: gnu: openmw: Fix build on glibc 2.34 and newer.
From: |
guix-commits |
Subject: |
07/11: gnu: openmw: Fix build on glibc 2.34 and newer. |
Date: |
Fri, 19 May 2023 10:50:43 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8c302c2e261bdba06d7b077aaf1bf1712ded2f40
Author: Kaelyn Takata <kaelyn.alexi@protonmail.com>
AuthorDate: Thu Apr 27 17:38:46 2023 +0000
gnu: openmw: Fix build on glibc 2.34 and newer.
* gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/game-development.scm (openmw)[source]<patches>: Use it here.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/local.mk | 1 +
gnu/packages/game-development.scm | 3 +-
.../patches/openmw-assume-nonconst-SIGSTKSZ.patch | 39 ++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 42514ded8e..17b07a1102 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1647,6 +1647,7 @@ dist_patch_DATA =
\
%D%/packages/patches/openjdk-10-setsignalhandler.patch \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \
+ %D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \
%D%/packages/patches/openssh-hurd.patch \
%D%/packages/patches/openssh-trust-guix-store-directory.patch \
%D%/packages/patches/openresolv-restartcmd-guix.patch \
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index be2ae96274..a2acf15c5c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1776,7 +1776,8 @@ of use.")
(file-name (git-file-name name version))
(sha256
(base32
- "19mcbnjl4279qalb97msf965bjax48mx1r1qczyvwhn28h6n3bsy"))))
+ "19mcbnjl4279qalb97msf965bjax48mx1r1qczyvwhn28h6n3bsy"))
+ (patches (search-patches "openmw-assume-nonconst-SIGSTKSZ.patch"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; No test target
diff --git a/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch
b/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch
new file mode 100644
index 0000000000..ed35563c2c
--- /dev/null
+++ b/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch
@@ -0,0 +1,39 @@
+From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail@gmail.com>
+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 86571e1e3a..c828e1ca81 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));
+--
+GitLab
+
- branch master updated (7ff9ca2201 -> bac28a52cb), guix-commits, 2023/05/19
- 01/11: gnu: criu: Reset timestamps in .egg file., guix-commits, 2023/05/19
- 02/11: gnu: sssd: Fix failing tests by using samba/pinned input, guix-commits, 2023/05/19
- 04/11: gnu: python-yamllint: Update to 1.31.0., guix-commits, 2023/05/19
- 05/11: teams: Correct chemistry.scm typo., guix-commits, 2023/05/19
- 07/11: gnu: openmw: Fix build on glibc 2.34 and newer.,
guix-commits <=
- 09/11: gnu: mympd: Update to 10.3.2., guix-commits, 2023/05/19
- 06/11: gnu: recastnavigation: Update to commit 6d1f971., guix-commits, 2023/05/19
- 03/11: gnu: sssd: Fix build, guix-commits, 2023/05/19
- 08/11: gnu: packages: Fix weechat-wee-slack build., guix-commits, 2023/05/19
- 11/11: gnu: python-cssutils: Update to 2.6.0., guix-commits, 2023/05/19
- 10/11: gnu: Add python-jaraco-test., guix-commits, 2023/05/19