diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-28 09:44:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-28 09:44:33 +0000 |
| commit | bf7aef61e7a785e8c8ec47b4dc044e9861e7d1be (patch) | |
| tree | ff330426bce05c3909a1bc67bf48f531ee79b36a /debian/patches | |
| parent | Adding upstream version 1.6.0. (diff) | |
| download | opentracing-cpp-bf7aef61e7a785e8c8ec47b4dc044e9861e7d1be.tar.xz opentracing-cpp-bf7aef61e7a785e8c8ec47b4dc044e9861e7d1be.zip | |
Adding debian version 1.6.0-4.debian/1.6.0-4debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/catch_SIGSTKSZ.patch | 40 | ||||
| -rw-r--r-- | debian/patches/riscv64-link-libatomic.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 57 insertions, 0 deletions
diff --git a/debian/patches/catch_SIGSTKSZ.patch b/debian/patches/catch_SIGSTKSZ.patch new file mode 100644 index 0000000..8f0765a --- /dev/null +++ b/debian/patches/catch_SIGSTKSZ.patch @@ -0,0 +1,40 @@ +Index: opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp +=================================================================== +--- opentracing-cpp-1.6.0.orig/3rd_party/include/opentracing/catch2/catch.hpp ++++ opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp +@@ -6571,6 +6571,17 @@ namespace Catch { + int id; + const char* name; + }; ++ ++ // 32kb for the alternate stack seems to be sufficient. However, this value ++ // is experimentally determined, so that's not guaranteed. ++ #if defined(_SC_SIGSTKSZ_SOURCE) || defined(_GNU_SOURCE) ++ // on glibc > 2.33 this is no longer constant, see ++ // https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=85e84fe53699fe9e392edffa993612ce08b2954a;hb=HEAD ++ static constexpr std::size_t altStackSize = 32 * 1024; ++ #else ++ static constexpr std::size_t altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), 32 * 1024) ++ #endif ++ + static SignalDefs signalDefs[] = { + { SIGINT, "SIGINT - Terminal interrupt signal" }, + { SIGILL, "SIGILL - Illegal instruction signal" }, +@@ -6597,7 +6608,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = altStackSize; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { }; +@@ -6628,7 +6639,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[altStackSize] = {}; + + } // namespace Catch + diff --git a/debian/patches/riscv64-link-libatomic.patch b/debian/patches/riscv64-link-libatomic.patch new file mode 100644 index 0000000..42bf93f --- /dev/null +++ b/debian/patches/riscv64-link-libatomic.patch @@ -0,0 +1,15 @@ +Description: Link libatomic on riscv64 and fix FTBFS +Author: Eric Long <i@hack3r.moe> +Last-Update: 2022-09-03 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,6 +155,9 @@ + list(APPEND LIBRARIES ${CMAKE_DL_LIBS}) + endif() + ++if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64") ++ list(APPEND LIBRARIES atomic) ++endif() + + if (BUILD_SHARED_LIBS) + add_library(opentracing SHARED ${SRCS}) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..12a004c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +catch_SIGSTKSZ.patch +riscv64-link-libatomic.patch |