diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch new file mode 100644 index 00000000..bde4f76c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From 37ea0b0c40f541cf9741c064e97ec9e9327ba7a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 | ||
4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This | ||
10 | causes massive failures at do_install [2] on qtbase. | ||
11 | |||
12 | To work around tell Qt build configuration not to use ranameet2 independent | ||
13 | of glibc version. | ||
14 | |||
15 | [1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 | ||
16 | [2] https://github.com/meta-qt5/meta-qt5/issues/187 | ||
17 | |||
18 | Upstream-Status: Inappropriate [OE-specific] | ||
19 | |||
20 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
21 | --- | ||
22 | src/corelib/global/qconfig-bootstrapped.h | 4 ++-- | ||
23 | src/corelib/io/qfilesystemengine_unix.cpp | 10 ---------- | ||
24 | 2 files changed, 2 insertions(+), 12 deletions(-) | ||
25 | |||
26 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | ||
27 | index e6ad80525a..283ce1ce26 100644 | ||
28 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
29 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
30 | @@ -104,7 +104,7 @@ | ||
31 | #define QT_FEATURE_process -1 | ||
32 | #define QT_FEATURE_regularexpression -1 | ||
33 | #ifdef __GLIBC_PREREQ | ||
34 | -# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
35 | +# define QT_FEATURE_renameat2 -1 | ||
36 | #else | ||
37 | # define QT_FEATURE_renameat2 -1 | ||
38 | #endif | ||
39 | @@ -112,7 +112,7 @@ | ||
40 | #define QT_FEATURE_signaling_nan -1 | ||
41 | #define QT_FEATURE_slog2 -1 | ||
42 | #ifdef __GLIBC_PREREQ | ||
43 | -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
44 | +# define QT_FEATURE_statx -1 | ||
45 | #else | ||
46 | # define QT_FEATURE_statx -1 | ||
47 | #endif | ||
48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | ||
49 | index c3abec8989..6229c611b8 100644 | ||
50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | ||
51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | ||
52 | @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | ||
53 | Q_CHECK_FILE_NAME(srcPath, false); | ||
54 | Q_CHECK_FILE_NAME(tgtPath, false); | ||
55 | |||
56 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) | ||
57 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) | ||
58 | - return true; | ||
59 | - | ||
60 | - // We can also get EINVAL for some non-local filesystems. | ||
61 | - if (errno != EINVAL) { | ||
62 | - error = QSystemError(errno, QSystemError::StandardLibraryError); | ||
63 | - return false; | ||
64 | - } | ||
65 | -#endif | ||
66 | #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) | ||
67 | if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) | ||
68 | return true; | ||