summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-01-16 12:47:51 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-01-16 14:21:42 +0000
commitce766374432309b85fdcfe8ef287dbb2ef11b337 (patch)
treef82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
parent229f819b97e653399455e7b1d491de5ea49d5ba5 (diff)
downloadmeta-qt5-ce766374432309b85fdcfe8ef287dbb2ef11b337.tar.gz
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository where the meta-qt5 .patch files are maintained, so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
new file mode 100644
index 00000000..9b6d5b0d
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
@@ -0,0 +1,32 @@
1From acc6c1d784aa7fe412cb175609e4286941d4bb55 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:44:48 -0700
4Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
5
6This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
7only when its glibc < 2 and not for other libcswhich may define
8it as per standards but are not glibc, e.g. musl
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 mkspecs/linux-clang/qplatformdefs.h | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h
16index d29225f..a0cdb57 100644
17--- a/mkspecs/linux-clang/qplatformdefs.h
18+++ b/mkspecs/linux-clang/qplatformdefs.h
19@@ -84,10 +84,10 @@
20
21 #undef QT_SOCKLEN_T
22
23-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
24-#define QT_SOCKLEN_T socklen_t
25-#else
26+#if defined(__GLIBC__) && (__GLIBC__ < 2)
27 #define QT_SOCKLEN_T int
28+#else
29+#define QT_SOCKLEN_T socklen_t
30 #endif
31
32 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)