diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2013-12-17 13:57:30 +0000 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-12-19 16:33:47 +0100 |
| commit | e4a839277f7d74104e25fb4fd846f9c2bf3f9c1e (patch) | |
| tree | 9e1284c191351310df7edb402cb77bc8e4d58bc4 /package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch | |
| parent | 60e9010ec843c736ce5d1d34d7a60a0abab23d84 (diff) | |
| download | buildroot-e4a839277f7d74104e25fb4fd846f9c2bf3f9c1e.tar.gz buildroot-e4a839277f7d74104e25fb4fd846f9c2bf3f9c1e.zip | |
qt5: version bump
-bump version to 5.2.0
-remove unneeded patches
-remove invalid configure options
[Peter: uclibc-no-lfs + qatomic patches still needed, new patch for uClibc]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch')
| -rw-r--r-- | package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch b/package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch new file mode 100644 index 0000000000..7c667db258 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0005-uclibc-no-gnu-lib-names.patch @@ -0,0 +1,44 @@ +[PATCH]: fix build on uClibc + +Reported upstream: https://bugreports.qt-project.org/browse/QTBUG-35742 + +uClibc defines __GNU_LIBRARY__ like glibc, but doesn't provide +gnu/lib-names.h, so the build breaks with: + +kernel/qdnslookup_unix.cpp:56:29: fatal error: gnu/lib-names.h: +No such file or directory + +Fix it by explicitly checking for !uClibc. + +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> +--- + src/network/kernel/qdnslookup_unix.cpp | 2 +- + src/network/kernel/qhostinfo_unix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: qt5base-5.2.0/src/network/kernel/qdnslookup_unix.cpp +=================================================================== +--- qt5base-5.2.0.orig/src/network/kernel/qdnslookup_unix.cpp ++++ qt5base-5.2.0/src/network/kernel/qdnslookup_unix.cpp +@@ -52,7 +52,7 @@ + #include <arpa/nameser_compat.h> + #include <resolv.h> + +-#ifdef __GNU_LIBRARY__ ++#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__) + # include <gnu/lib-names.h> + #endif + +Index: qt5base-5.2.0/src/network/kernel/qhostinfo_unix.cpp +=================================================================== +--- qt5base-5.2.0.orig/src/network/kernel/qhostinfo_unix.cpp ++++ qt5base-5.2.0/src/network/kernel/qhostinfo_unix.cpp +@@ -63,7 +63,7 @@ + # include <resolv.h> + #endif + +-#ifdef __GNU_LIBRARY__ ++#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__) + # include <gnu/lib-names.h> + #endif + |
