qtbase: Fix build with musl

This is a generic fix to accomodate musl which is adhering to posix
and doesnt have legacy to carry, so lets invert the conditional so the
special legacy case of glibc is checked and else part then covers rest
of cases which are newer glibc/uclibc and musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2015-06-08 14:39:08 -07:00
committed by Martin Jansa
parent eedb3e6413
commit d9d1d04760
2 changed files with 36 additions and 0 deletions

View File

@@ -0,0 +1,35 @@
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(-)
diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
index dd12003..8623651 100644
--- a/mkspecs/linux-oe-g++/qplatformdefs.h
+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
@@ -86,10 +86,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)
--
2.1.4

View File

@@ -21,6 +21,7 @@ SRC_URI += "\
file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
file://0009-QOpenGLPaintDevice-sub-area-support.patch \
file://0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \
file://0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
"
# specific for qtbase