0001-qsgtexture-fix-debug-build-with-uclibc.patch 1.8 KB

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