mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-qt/qt-creator: rebase execinfo patch in live
Untested but the patch is identical beside needing to update a moved file's path. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
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>
|
||||
@@ -31,5 +31,5 @@
|
||||
namespace QmlDesigner {
|
||||
|
||||
-#ifdef Q_OS_LINUX
|
||||
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
|
||||
const char* demangle(const char* name)
|
||||
{
|
||||
@@ -76,5 +76,5 @@
|
||||
}
|
||||
|
||||
-#ifdef Q_OS_LINUX
|
||||
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
|
||||
static QString getBackTrace()
|
||||
{
|
||||
@@ -114,5 +114,5 @@
|
||||
, m_file(QString::fromUtf8(file))
|
||||
, m_description(description)
|
||||
- #ifdef Q_OS_LINUX
|
||||
+ #if defined(Q_OS_LINUX) && defined(__GLIBC__)
|
||||
, m_backTrace(getBackTrace())
|
||||
#endif
|
||||
@@ -97,7 +97,7 @@ BDEPEND="
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
|
||||
"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
|
||||
"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user