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

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 2a5711651bee9d021733da19126a71aeda45e646 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. ---
  20. src/quick/scenegraph/util/qsgtexture.cpp | 2 +-
  21. 1 file changed, 1 insertion(+), 1 deletion(-)
  22. diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
  23. index fea92a512..a26191006 100644
  24. --- a/src/quick/scenegraph/util/qsgtexture.cpp
  25. +++ b/src/quick/scenegraph/util/qsgtexture.cpp
  26. @@ -53,7 +53,7 @@
  27. #endif
  28. #include <private/qsgmaterialshader_p.h>
  29. -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__)
  30. +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__)
  31. #define CAN_BACKTRACE_EXECINFO
  32. #endif
  33. --
  34. 2.14.1