From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mMyNHJKzSmQZHgEASxT56A (envelope-from ) for ; Thu, 27 Apr 2023 19:40:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id sHuFHJKzSmQyhQEA9RJhRA (envelope-from ) for ; Thu, 27 Apr 2023 19:40:34 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 50B462F30A for ; Thu, 27 Apr 2023 19:40:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps5bA-0006QM-9H; Thu, 27 Apr 2023 13:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps5b9-0006Q4-4J for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ps5b8-0002z3-5V for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps5b8-0004xf-0u for guix-patches@gnu.org; Thu, 27 Apr 2023 13:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63126] [PATCH 2/2] gnu: openmw: Fix build on glibc 2.34 and newer. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 17:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63126@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63126-submit@debbugs.gnu.org id=B63126.168261714918990 (code B ref 63126); Thu, 27 Apr 2023 17:40:01 +0000 Received: (at 63126) by debbugs.gnu.org; 27 Apr 2023 17:39:09 +0000 Received: from localhost ([127.0.0.1]:59741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps5aG-0004wE-J4 for submit@debbugs.gnu.org; Thu, 27 Apr 2023 13:39:08 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:30789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps5aD-0004vX-Ve for 63126@debbugs.gnu.org; Thu, 27 Apr 2023 13:39:06 -0400 Date: Thu, 27 Apr 2023 17:38:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682617140; x=1682876340; bh=A/ZwrgK55mI45VI3kePB9cGkT4gBdUZijE2HZA+nBBE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Z93pbTofKAZCgI37cp6SuQJxM5O73Byh0WlXo05Dc0WJlDCJiN6Oj20XQgTc8cNZn agflWSASYxwMnxDg4ozohwyf0PMaPMcoCN3TsROtJQILhj068tN+abwIT9eafXBG7n RJzy+z67BN1vhq1wxQWuxsmDA0SaxfDymZ08g6caOkVDwf7pB52M/xGhr1OeNyMo7i 2A5DPJPU4bwwXgFKblHfzlTZR9eDqxrLvRFKD6v9bzNkM4GhRk+sPaNJJPEvTh0CDq VjgKSs4BOS2A7JEooSCNmeeN62eiTiGNy3AhLlCOQvk+Nnu4BtwP9F0I/3rW01ZxeM rEEQvXrvY73Pg== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682617234; a=rsa-sha256; cv=none; b=EFyeYxq47haLNrKju5UALj3EzdmQ0M8XifJv3ez2Y2onpDBhaJXIwhBIEeuAmMYj1OCnje hRpSKlHB4QAmB/szo44vLSjIH7a4NpS4tiV3RojK1MHRmtI5qBaQZq+F5/GV7Lol1Njvuu 4o43hYhR0VtnMlJUlVUUJqVK6TYMRJp7T1hSMPcj+S+cf+yDwDFt3EpU4sLTyRPgwEixkF 5Pu/LmY1IB36MG3gI3KPvbTW+2VFMMupdMBv8GwKBdpujGZAS9/xCfJxpt6/zjYQnvl2VE XoRjLKPF77dePgErLfWB0u0zxt60c45prZiXETRS0JkjjwvzTkjIkTYiVAa7jQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=Z93pbTof; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682617234; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=A/ZwrgK55mI45VI3kePB9cGkT4gBdUZijE2HZA+nBBE=; b=RzpMfqZvqusrqKuZlHDGbPiDUDRK1s8/nAYHEpPG53Fqnr1rx8YSkfqVd+GyOjBra220rZ hB0o8tDNkN3QxeotMZXR8PwCEa3gwU1U9v6Des9d5w/HD1gteS9kN+mOO4C0iqOS9duwvD nKNMZGrzPWAhPnUScSsxPH7WFBZrO8VfX9vEGO2Q1LWBpkF6HmeMLMvM4wP199alPhJU1Z 1vVLMFzo0GL++tQ2dXWTxJusosNldwGNQAJS5oI/Hq4hyucUrctZXvXJF55a0rGqm2qpfT GJM1e0EAg8CXH1wbWekbiWnoYlT+DRY/svslauKxphI+Kkh6J5g7zqA8KzgYZQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=Z93pbTof; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.20 X-Spam-Score: -2.20 X-Migadu-Queue-Id: 50B462F30A X-TUID: d37Y9MuAMpa9 * 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]: Use it here. --- gnu/local.mk | 1 + gnu/packages/game-development.scm | 3 +- .../openmw-assume-nonconst-SIGSTKSZ.patch | 39 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index c0a5c721fc..448c9d8139 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1640,6 +1640,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/openjdk-10-setsignalhandler.patch \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch=09\ %D%/packages/patches/openmpi-mtl-priorities.patch=09=09\ + %D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \ %D%/packages/patches/openssh-hurd.patch=09=09=09\ %D%/packages/patches/openssh-trust-guix-store-directory.patch=09\ %D%/packages/patches/openresolv-restartcmd-guix.patch=09\ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-developm= ent.scm index a3a331c290..c22b33e177 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1775,7 +1775,8 @@ (define-public openmw (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/g= nu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch new file mode 100644 index 0000000000..ff0080e28a --- /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 +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=3Dglibc.git;a=3Dcommit;h=3D6c57d320484988e87= e446e2e60ce42816bf51d53 +--- + components/crashcatcher/crashcatcher.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashca= tcher/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[] =3D "!!! Failed to exec deb= ug 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 overflow= s + * still run */ ++ static char* altstack =3D new char [SIGSTKSZ]; + altss.ss_sp =3D altstack; + altss.ss_flags =3D 0; +- altss.ss_size =3D sizeof(altstack); ++ altss.ss_size =3D SIGSTKSZ; + sigaltstack(&altss, nullptr); + + memset(&sa, 0, sizeof(sa)); +-- +GitLab + -- 2.39.2