dev-qt/qt-creator: rebase execinfo patch in live

Not really tested but should work. It seems that the 2nd execinfo.h
is unused now (included for nothing), so can just drop the other
hunks given the code is gone assuming that not overlooking anything
elsewhere.

Closes: https://bugs.gentoo.org/950276
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2025-02-25 11:57:42 -05:00
parent 9aacb87c21
commit 8eccbe3102
2 changed files with 27 additions and 1 deletions
@@ -0,0 +1,26 @@
execinfo is unavailable with musl (unless opt to package+use libexecinfo)
--- a/src/libs/utils/qtcassert.cpp
+++ b/src/libs/utils/qtcassert.cpp
@@ -9,5 +9,5 @@
#include <QTime>
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
#include <stdio.h>
#include <signal.h>
@@ -30,5 +30,5 @@
if (maxdepth < 0 || maxdepth > ArraySize)
maxdepth = ArraySize;
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
void *bt[ArraySize] = {nullptr};
int size = backtrace(bt, maxdepth);
--- a/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
+++ b/src/plugins/qmldesigner/libs/designercore/exceptions/exception.cpp
@@ -4,5 +4,5 @@
#include "exception.h"
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
#include <execinfo.h>
#include <cxxabi.h>
+1 -1
View File
@@ -100,7 +100,7 @@ BDEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-16.0.0-musl-no-execinfo.patch
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
)