qt5base: fix musl build

This was taken from upstream qt5 and modified a little bit to match
OpenWrt.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/frameworks/qt5base/patches/002-musl.patch b/frameworks/qt5base/patches/002-musl.patch
new file mode 100644 (file)
index 0000000..2f5fe45
--- /dev/null
+++ b/frameworks/qt5base/patches/002-musl.patch
@@ -0,0 +1,30 @@
+From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 8 Jun 2015 13:59:25 -0700
+Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
+
+This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
+only when its glibc < 2 and not also for the libraries which may define
+it as per standards but are not glibc, e.g. musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/mkspecs/linux-g++/qplatformdefs.h
++++ b/mkspecs/linux-g++/qplatformdefs.h
+@@ -78,10 +78,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)

diff --git a/frameworks/qt5base/patches/002-uclibc-execinfo.patch b/frameworks/qt5base/patches/002-uclibc-execinfo.patch
index ae263333102539e685917c6cd010b750d03439d0..6ad2624c2ca8ce61b4e3c5633e9ffb59bcbd1d5b 100644 (file)
--- a/frameworks/qt5base/patches/002-uclibc-execinfo.patch
+++ b/frameworks/qt5base/patches/002-uclibc-execinfo.patch
@@ -1,6 +1,6 @@
---- qtbase-opensource-src-5.4.1.orig/src/corelib/kernel/qcrashhandler.cpp      2015-05-27 21:29:18.327561992 +0200
-+++ qtbase-opensource-src-5.4.1/src/corelib/kernel/qcrashhandler.cpp   2015-05-27 21:34:18.543553856 +0200
-@@ -62,7 +62,7 @@
+--- a/src/corelib/kernel/qcrashhandler.cpp
++++ b/src/corelib/kernel/qcrashhandler.cpp
+@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
  
  QtCrashHandler QSegfaultHandler::callback = 0;