nginx-module-opentracing: fixed building with glibc 2.34. See this for details: https://bugs.launchpad.net/ubuntu/+source/opentracing-cpp/+bug/1951665
diff --git a/alpine/Makefile.module-opentracing b/alpine/Makefile.module-opentracing index 3ccd74e..78a512b 100644 --- a/alpine/Makefile.module-opentracing +++ b/alpine/Makefile.module-opentracing
@@ -18,6 +18,7 @@ jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz MODULE_PATCHES_opentracing= $(CONTRIB)/src/opentracing-cpp/CMakeLists.txt.patch \ + $(CONTRIB)/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch \ $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.patch \ $(CONTRIB)/src/thrift/CMakeLists.txt.patch \ $(CONTRIB)/src/thrift/build-cmake-Config.cmake.in.patch \
diff --git a/contrib/src/opentracing-cpp/Makefile b/contrib/src/opentracing-cpp/Makefile index 27e2b5e..a4fb6af 100644 --- a/contrib/src/opentracing-cpp/Makefile +++ b/contrib/src/opentracing-cpp/Makefile
@@ -13,6 +13,7 @@ opentracing-cpp: opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz .sum-opentracing-cpp $(UNPACK) $(APPLY) $(SRC)/opentracing-cpp/CMakeLists.txt.patch + $(APPLY) $(SRC)/opentracing-cpp/fix-ftbfs-glibc-2.34.patch $(MOVE) .opentracing-cpp: opentracing-cpp
diff --git a/contrib/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch b/contrib/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch new file mode 100644 index 0000000..7adb3f6 --- /dev/null +++ b/contrib/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch
@@ -0,0 +1,42 @@ +Author: Sergio Durigan Junior <sergio.durigan@canonical.com> +Forwarded: yes, https://github.com/opentracing/opentracing-cpp/pull/142 +Last-Update: 2021-11-19 + +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 2021-11-19 20:01:32.336577631 -0500 ++++ opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp 2021-11-19 20:12:17.853232501 -0500 +@@ -6462,7 +6462,7 @@ + static bool isSet; + static struct sigaction oldSigActions[];// [sizeof(signalDefs) / sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[]; ++ static char *altStackMem; + + static void handleSignal( int sig ); + +@@ -6594,6 +6594,7 @@ + } + + FatalConditionHandler::FatalConditionHandler() { ++ altStackMem = new(char[SIGSTKSZ]); + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +@@ -6610,6 +6611,7 @@ + } + + FatalConditionHandler::~FatalConditionHandler() { ++ delete[] altStackMem; + reset(); + } + +@@ -6628,7 +6630,7 @@ + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char *FatalConditionHandler::altStackMem; + + } // namespace Catch +
diff --git a/debian/Makefile.module-opentracing b/debian/Makefile.module-opentracing index 720889a..0677519 100644 --- a/debian/Makefile.module-opentracing +++ b/debian/Makefile.module-opentracing
@@ -18,6 +18,7 @@ jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz MODULE_PATCHES_opentracing= $(CONTRIB)/src/opentracing-cpp/CMakeLists.txt.patch \ + $(CONTRIB)/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch \ $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.patch \ $(CONTRIB)/src/thrift/CMakeLists.txt.patch \ $(CONTRIB)/src/thrift/build-cmake-Config.cmake.in.patch \
diff --git a/rpm/SPECS/Makefile.module-opentracing b/rpm/SPECS/Makefile.module-opentracing index 219853f..3506c41 100644 --- a/rpm/SPECS/Makefile.module-opentracing +++ b/rpm/SPECS/Makefile.module-opentracing
@@ -18,6 +18,7 @@ jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz MODULE_PATCHES_opentracing= $(CONTRIB)/src/opentracing-cpp/CMakeLists.txt.patch \ + $(CONTRIB)/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch \ $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.patch \ $(CONTRIB)/src/thrift/CMakeLists.txt.patch \ $(CONTRIB)/src/thrift/build-cmake-Config.cmake.in.patch \