diff options
| -rw-r--r-- | dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch | 27 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch b/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch new file mode 100644 index 000000000000..c74de19c6144 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch @@ -0,0 +1,27 @@ +QtCore only links with -lexecinfo on *bsd and +incorrectly assumes it's already linked on Linux +if execinfo.h exists. + +This is a fix specificallly for non-glibc systems, was written for musl. +We'll look to add a build system option for libexecinfo in future. + +--- + src/corelib/global/qlogging.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp +index 89f49324..1c34a1af 100644 +--- a/src/corelib/global/qlogging.cpp ++++ b/src/corelib/global/qlogging.cpp +@@ -106,7 +106,7 @@ + # if __UCLIBC_HAS_BACKTRACE__ + # define QLOGGING_HAVE_BACKTRACE + # endif +-# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>)) ++# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) + # define QLOGGING_HAVE_BACKTRACE + # endif + #endif +-- +2.35.1 + diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild index 22d03f26bc3a..2b2d3b2fe2b5 100644 --- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild @@ -27,6 +27,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-hack_never_use_execinfo.patch" ) + QT5_TARGET_SUBDIRS=( src/tools/bootstrap src/tools/moc |