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