diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-09-03 11:10:35 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-09-05 14:56:05 +0200 |
| commit | ec80b092470a8bc775c2d9dd6fa19827019190c1 (patch) | |
| tree | 80a044007a6d5e25b6110601f41ef7444f486c2e /recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch | |
| parent | 90d4a41621886ae5e738ec8a0b693e88b25d8267 (diff) | |
| download | meta-qt5-ec80b092470a8bc775c2d9dd6fa19827019190c1.tar.gz | |
qtbase: Fix build with musl/clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch new file mode 100644 index 00000000..0c7fb874 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From 8394ad48f454aa292e4da57b3b75a3701dadcf96 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 3 Sep 2017 09:44:48 -0700 | ||
| 4 | Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T | ||
| 5 | |||
| 6 | This helps to make sure that QT_SOCKLEN_T is defined to be 'int' | ||
| 7 | only when its glibc < 2 and not for other libcswhich may define | ||
| 8 | it as per standards but are not glibc, e.g. musl | ||
| 9 | |||
| 10 | Signed-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 | |||
| 15 | diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h | ||
| 16 | index d29225f12f..a0cdb57343 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) | ||
| 33 | -- | ||
| 34 | 2.14.1 | ||
| 35 | |||
