diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-02 18:53:34 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2017-07-03 00:05:18 +0200 |
commit | 35bc55eaaae8d9d463d3fddcf0b200685014865a (patch) | |
tree | 82fe3b047abb366aebc02468371b9a18f340f8da /package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch | |
parent | e9b614ad3ad6bdeb48179dfa622dc7e3134806e2 (diff) | |
download | buildroot-35bc55eaaae8d9d463d3fddcf0b200685014865a.tar.gz buildroot-35bc55eaaae8d9d463d3fddcf0b200685014865a.zip |
qt: don't download patch from Github
Patches downloaded from Github are not stable, so bring them in the
tree.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch')
-rw-r--r-- | package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch b/package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch new file mode 100644 index 0000000000..9b1655322a --- /dev/null +++ b/package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch @@ -0,0 +1,43 @@ +From 0bf90de93b9fe21df32319e27b2507154fa8a21d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +Date: Fri, 15 Apr 2016 00:37:26 +0200 +Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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. + +This patch is adapted from Qt5 [1]. + +[1] +https://github.com/qtproject/qtbase/commit/813f468a14fb84af43c1f8fc0a1430277358eba2 + +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + mkspecs/linux-g++/qplatformdefs.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h +index de751dd..d4146ed 100644 +--- a/mkspecs/linux-g++/qplatformdefs.h ++++ b/mkspecs/linux-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.8.0 + |