summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
diff options
context:
space:
mode:
authorJulien CORJON <corjon.j@ecagroup.com>2015-07-21 13:30:14 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-21 23:20:47 +0200
commit105c23cedb54f34e80a303c6af02c4398f72f029 (patch)
tree29614ec29b44864cda38f5e4f75ab2d6cd8cbdbd /package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
parentaa24cb8b4fac7b2a6aae38ee0d1d798fdbf54f23 (diff)
downloadbuildroot-105c23cedb54f34e80a303c6af02c4398f72f029.tar.gz
buildroot-105c23cedb54f34e80a303c6af02c4398f72f029.zip
qt5: bump version to 5.5.0
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1]. We still need specifics include path for rpi eglfs support. 0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains. Remove patches commited in Qt mainline and update pending one [1] https://codereview.qt-project.org/#/c/107548/ Passed test : - Full compilation on ARM/uClibc - Partialy compiled and tested on i.MX6/linaro with OpenGL backend - Partialy compiled but not executed for Raspberry Pi (rpi-userland) Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch')
-rw-r--r--package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch b/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
deleted file mode 100644
index 7d884adc74..0000000000
--- a/package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9f03adc74fa06e9559e8bb85f1cfd942397328b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
-Date: Wed, 24 Dec 2014 17:29:11 +0200
-Subject: [PATCH] logging: Check if uClibc has backtrace support
-
-execinfo.h is optional in uClibc. We need to check
-__UCLIBC_HAS_BACKTRACE__ if uClibc is used.
-
-Change-Id: Ie28be85b0b70472df1fc4a208581bb66ad34229e
-Sent-Upstream: https://codereview.qt-project.org/#/c/102628/
-Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
----
- src/corelib/global/qlogging.cpp | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
-index 50d35a6..fa897d6 100644
---- a/src/corelib/global/qlogging.cpp
-+++ b/src/corelib/global/qlogging.cpp
-@@ -77,14 +77,21 @@
- #endif
-
- #if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)
--# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
-+# ifdef __UCLIBC__
-+# if __UCLIBC_HAS_BACKTRACE__
-+# define QLOGGING_HAVE_BACKTRACE
-+# endif
-+# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
- # define QLOGGING_HAVE_BACKTRACE
--# include <qregularexpression.h>
--# include <cxxabi.h>
--# include <execinfo.h>
- # endif
- #endif
-
-+#ifdef QLOGGING_HAVE_BACKTRACE
-+# include <qregularexpression.h>
-+# include <cxxabi.h>
-+# include <execinfo.h>
-+#endif
-+
- #include <stdio.h>
-
- QT_BEGIN_NAMESPACE
---
-1.9.1
-
OpenPOWER on IntegriCloud