1From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Thu, 29 Nov 2018 23:33:10 +0100 4Subject: [PATCH] qsgtexture: fix debug build with uclibc 5 6Debug build of gsgtexture fails on uclibc since version 5.11 and 7https://github.com/qt/qtdeclarative/commit/7c507eaac3f848f92f2ebdafe8ded4a064d68351: 8 9scenegraph/util/qsgtexture.cpp:69:22: fatal error: execinfo.h: No such file or directory 10 #include <execinfo.h> 11 12Indeed, !defined(__UCLIBC__) has been replaced by defined(__GBLIBC__) to 13fix build on musl but as a result, build fails on uclibc because uclibc 14also defines __GLIBC__ (and it does not have execinfo like musl) 15 16This error is raised only when building in debug mode because 17CAN_BACKTRACE_EXECINFO is undefined if QT_NO_DEBUG is set 18 19So keep defined(__GLIBC__), but put back !defined(__UCLIBC__) 20 21Fixes: 22 - http://autobuild.buildroot.org/results/6fce0ce5aea943e097532efbbc8d1e28f41e5866 23 24Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 25[Upstream status: https://github.com/qt/qtdeclarative/pull/4] 26[Rebased for Qt5.14.0] 27Signed-off-by: Peter Seiderer <ps.report@gmx.net> 28--- 29 src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +- 30 1 file changed, 1 insertion(+), 1 deletion(-) 31 32diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp 33index dfbe4d3f..6a7bc79b 100644 34--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp 35+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp 36@@ -46,7 +46,7 @@ 37 #include <private/qsgmaterialshader_p.h> 38 #include <QtGui/private/qrhi_p.h> 39 40-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) 41+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__) 42 #define CAN_BACKTRACE_EXECINFO 43 #endif 44 45-- 462.23.0 47 48