gentoo auto-resync : 17:08:2022 - 20:33:10

3 files changed, 55 insertions, 2 deletions

diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 7ed3409595dd..7740de18ad8f 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,4 @@
+AUX sink-0.8.0-musl-execinfo.patch 1385 BLAKE2B cd8221e6b5adc56d6d308781d020e47679b49b9099377a4892d6b63c19a2e3d74e32e9254e947b8cf1d5ced281bd4f95d73df26e0eb346a8d6582b1c88f660d8 SHA512 c5a61110ac2288680ae6025442f53a1828a4644f7cd28e3b36d9404933d60deca18ec28ae80f1e09bae19564fd0308f83abd5bd9b09d0d02bc2fea8a0e4d54ac
 DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
-EBUILD sink-0.8.0-r3.ebuild 1397 BLAKE2B 1bfd9829b5b0fe000900d44dcaa6254b541234a9ce99b6cf51714e95a6abf332f599605a77327496a9d0e1e9d669f514864ff002f37de61ed77e72c4ff0d07d0 SHA512 5525bb993f5100d1a5fdad5559156744ed0ea2feb456c3887516515a13b689cfcecc6212f1b94a6cc739ca2889071b39c301f68bbdb2e6b2f3e1077c631acf1b
+EBUILD sink-0.8.0-r3.ebuild 1457 BLAKE2B 8b8d77e3b4db09bf2c233492483c229cd96ff03304b622b25afb2f5f687ee239cd72a10b775746876fbe758062e97cb06081f17f0ef0b6ee2a240fc054061ae7 SHA512 24723a0ca0f45617ed4c9090f440eb97d45fab42ee2640078c669deeb0b288e67da2f86799da3352b2098566e7dc6017da097d5adef3b1bf85bf3c6571c09546
 MISC metadata.xml 236 BLAKE2B 219db736f77611984b5f2e1279f05575460ed974eee871808e2416e919104f563db1b29146c8dc34d8acac54edadbe5da16ca957c969c28922676e13bfb6c36b SHA512 09114b2f38ebda6f06b8c48887dfd47a4d632110afd7904ddbca9af0c7c402634415c765b49a6231dbec01f05c78210adef4f81f28138b56217dfa55d854dc63
diff --git a/dev-libs/sink/files/sink-0.8.0-musl-execinfo.patch b/dev-libs/sink/files/sink-0.8.0-musl-execinfo.patch
new file mode 100644
index 000000000000..b5085702a33e
--- /dev/null
+++ b/dev-libs/sink/files/sink-0.8.0-musl-execinfo.patch
@@ -0,0 +1,48 @@
+# Since musl doesn't have execinfo. We're going to avoid including it and make
+# the printStacktrace function void
+# Closes: https://bugs.gentoo.org/830945
+--- a/synchronizer/CMakeLists.txt
++++ b/synchronizer/CMakeLists.txt
+@@ -2,6 +2,12 @@ project(sink_synchronizer)
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
++INCLUDE(CheckIncludeFiles)
++CHECK_INCLUDE_FILES("execinfo.h" HAVE_EXECINFO)
++IF (HAVE_EXECINFO)
++	add_compile_definitions(HAVE_EXECINFO_H)
++ENDIF(HAVE_EXECINFO)
++
+ set(sinksynchronizer_SRCS
+     main.cpp
+     backtrace.cpp
+--- a/synchronizer/backtrace.cpp
++++ b/synchronizer/backtrace.cpp
+@@ -31,7 +31,9 @@
+ #include <chrono>
+
+ #ifndef Q_OS_WIN
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif // HAVE_EXECINFO_H
+ #include <unistd.h>
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+@@ -143,7 +145,7 @@ private:
+ //Print a demangled stacktrace
+ static void printStacktrace()
+ {
+-#ifndef Q_OS_WIN
++#if !defined(Q_OS_WIN) && defined(HAVE_EXECINFO_H)
+     int skip = 1;
+ 	void *callstack[128];
+ 	const int nMaxFrames = sizeof(callstack) / sizeof(callstack[0]);
+@@ -178,7 +180,7 @@ static void printStacktrace()
+ 		trace_buf << "[truncated]\n";
+     }
+     std::cerr << trace_buf.str();
+-#else
++#elif defined(Q_OS_WIN)
+     enum { maxStackFrames = 100 };
+     DebugSymbolResolver resolver(GetCurrentProcess());
+     if (resolver.isValid()) {
diff --git a/dev-libs/sink/sink-0.8.0-r3.ebuild b/dev-libs/sink/sink-0.8.0-r3.ebuild
index 78d2b574ac2b..c8108f329bf4 100644
--- a/dev-libs/sink/sink-0.8.0-r3.ebuild
+++ b/dev-libs/sink/sink-0.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
 # fails to build
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-musl-execinfo.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# tests are sprinkled all over the place, and examples are needed...