diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 08:37:18 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (patch) | |
tree | ada273f12808c8c1ed9e4585638c63d93d8363a4 /recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch | |
parent | 3e7da25564d74195610adede9391ca733a0a1412 (diff) | |
download | meta-qt5-f9e80edff01159375b6e03f3cb9ea1f8ed5ced79.tar.gz |
qt5: update to latest revision in 5.11 branch
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
removed again
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch new file mode 100644 index 00000000..673e8fd9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 067dd79223c12e40930e612964a77066393a4131 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Tue, 21 Aug 2018 00:29:06 +0200 | ||
4 | Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped | ||
5 | build | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
13 | --- | ||
14 | src/corelib/io/qfilesystemengine_unix.cpp | 11 +++++++++++ | ||
15 | 1 file changed, 11 insertions(+) | ||
16 | |||
17 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | ||
18 | index deb4a9f220..ecf23168e7 100644 | ||
19 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | ||
20 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | ||
21 | @@ -97,6 +97,17 @@ extern "C" NSString *NSTemporaryDirectory(); | ||
22 | # define FICLONE _IOW(0x94, 9, int) | ||
23 | #endif | ||
24 | |||
25 | +// renameat2/statx features for non bootstrapped build | ||
26 | +#ifndef QT_BOOTSTRAPPED | ||
27 | +#ifdef __GLIBC_PREREQ | ||
28 | +# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
29 | +# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
30 | +#else | ||
31 | +# define QT_FEATURE_renameat2 -1 | ||
32 | +# define QT_FEATURE_statx -1 | ||
33 | +#endif | ||
34 | +#endif | ||
35 | + | ||
36 | # if defined(Q_OS_ANDROID) | ||
37 | // renameat2() and statx() are disabled on Android because quite a few systems | ||
38 | // come with sandboxes that kill applications that make system calls outside a | ||