rpms/catch1
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch for non-constant SIGSTKSZ

Browse Source
This commit is contained in:
Tom Hughes 2021-02-19 10:56:09 +00:00
parent 7687d4cb05
commit 059104ba87
2 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
catch1-sigstksz.patch Normal file
View File

@ -0,0 +1,68 @@
commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680
Author: Tom Hughes <tom@compton.nu>
Date: Fri Feb 19 10:45:49 2021 +0000
Patch for non-constant SIGSTKSZ
diff --git a/include/internal/catch_fatal_condition.hpp b/include/internal/catch_fatal_condition.hpp
index 1dcd545d..f7d9e10d 100644
--- a/include/internal/catch_fatal_condition.hpp
+++ b/include/internal/catch_fatal_condition.hpp
@@ -136,7 +136,7 @@ namespace Catch {
static bool isSet;
static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
static stack_t oldSigStack;
- static char altStackMem[SIGSTKSZ];
+ static char altStackMem[32768];
static void handleSignal( int sig ) {
std::string name = "<unknown signal>";
@@ -156,7 +156,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 = { 0 };
@@ -188,7 +188,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
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index fdb046fe..d64fd1a5 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -6540,7 +6540,7 @@ namespace Catch {
static bool isSet;
static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
static stack_t oldSigStack;
- static char altStackMem[SIGSTKSZ];
+ static char altStackMem[32768];
static void handleSignal( int sig ) {
std::string name = "<unknown signal>";
@@ -6560,7 +6560,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 = { 0 };
@@ -6591,7 +6591,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

11
catch1.spec
View File

@ -2,12 +2,14 @@
Name: catch1 Name: catch1
Version: 1.12.2 Version: 1.12.2
Release: 7%{?dist} Release: 8%{?dist}
Summary: A modern, C++-native, header-only, framework for unit-tests, TDD and BDD Summary: A modern, C++-native, header-only, framework for unit-tests, TDD and BDD
License: Boost License: Boost
URL: https://github.com/philsquared/Catch URL: https://github.com/catchorg/Catch2
Source0: https://github.com/philsquared/Catch/archive/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/catchorg/Catch2/archive/v%{version}/%{name}-%{version}.tar.gz
# https://github.com/catchorg/Catch2/issues/2178
Patch0: catch1-sigstksz.patch
BuildRequires: cmake make gcc-c++ BuildRequires: cmake make gcc-c++
@ -55,6 +57,9 @@ cp -pr include %{buildroot}%{_includedir}/catch
%changelog %changelog
* Fri Feb 19 2021 Tom Hughes <tom@compton.nu> - 1.12.2-8
- Add patch for non-constant SIGSTKSZ
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-7 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild