pool/diy
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 927016 from science

Browse Source 
Add diy-glibc2.34-drop-SIGSTKSZ.patch to compile against glibc >= 2.34 which no longer defines SIGSTKSZ as constant (see, for instance, gh#catchorg/Catch2#2178).

OBS-URL: https://build.opensuse.org/request/show/927016
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/diy?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2021-10-22 22:51:49 +00:00 committed by Git OBS Bridge
commit c9f2a0e2c9
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
diy-glibc2.34-drop-SIGSTKSZ.patch Normal file
View File

@ -0,0 +1,22 @@
Index: diy-3.5.0/tests/catch.hpp
===================================================================
--- diy-3.5.0.orig/tests/catch.hpp
+++ diy-3.5.0/tests/catch.hpp
@@ -7252,7 +7252,7 @@ namespace Catch {
isSet = true;
stack_t sigStack;
sigStack.ss_sp = altStackMem;
- sigStack.ss_size = SIGSTKSZ;
+ sigStack.ss_size = 32768;
sigStack.ss_flags = 0;
sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = { };
@@ -7283,7 +7283,7 @@ namespace Catch {
bool FatalConditionHandler::isSet = false;
struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
stack_t FatalConditionHandler::oldSigStack = {};
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+ char FatalConditionHandler::altStackMem[32768] = {};
} // namespace Catch

7
diy.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 20 07:57:33 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Add diy-glibc2.34-drop-SIGSTKSZ.patch to compile against glibc
>= 2.34 which no longer defines SIGSTKSZ as constant
(see, for instance, gh#catchorg/Catch2#2178).
-------------------------------------------------------------------
Sat Jun 6 21:23:45 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

4
diy.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package diy
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -60,6 +60,8 @@ Source: https://github.com/diatomic/diy/archive/%{version}.tar.gz#/%{pna
Patch0: diy-disable-memory-heavy-tests.patch
# PATCH-FIX-UPSTREAM diy-include-stdexcept.patch badshah400@gmail.com -- Include a missing header flagged by GCC 10
Patch1: diy-include-stdexcept.patch
# PATCH-FIX-UPSTREAM diy-glibc2.34-drop-SIGSTKSZ.patch gh#catchorg/Catch2#2178 badshah400@gmail.com -- Replace SIGSTKSZ by hard-coded 32kb to allow compilation against glibc 2.34 where SIGSTKSZ is no longer a constant
Patch2: diy-glibc2.34-drop-SIGSTKSZ.patch
BuildRequires: cmake >= 3.2
BuildRequires: gcc-c++
%if %{with mpi}