diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch new file mode 100644 index 00000000..0ca038f5 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | From 69aeac9c7233e0d76a8a00b1a45c53c1670c9b49 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 dfcc3c9c7f..30166fe41c 100644 | ||
| 28 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
| 29 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
| 30 | @@ -100,14 +100,14 @@ | ||
| 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 | #define QT_FEATURE_sharedmemory -1 | ||
| 40 | #define QT_FEATURE_slog2 -1 | ||
| 41 | #ifdef __GLIBC_PREREQ | ||
| 42 | -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
| 43 | +# define QT_FEATURE_statx -1 | ||
| 44 | #else | ||
| 45 | # define QT_FEATURE_statx -1 | ||
| 46 | #endif | ||
| 47 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | ||
| 48 | index b2d81066db..d1783ebdf3 100644 | ||
| 49 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | ||
| 50 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | ||
| 51 | @@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | ||
| 52 | if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) | ||
| 53 | return emptyFileEntryWarning(), false; | ||
| 54 | |||
| 55 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) | ||
| 56 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) | ||
| 57 | - return true; | ||
| 58 | - | ||
| 59 | - // We can also get EINVAL for some non-local filesystems. | ||
| 60 | - if (errno != EINVAL) { | ||
| 61 | - error = QSystemError(errno, QSystemError::StandardLibraryError); | ||
| 62 | - return false; | ||
| 63 | - } | ||
| 64 | -#endif | ||
| 65 | #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) | ||
| 66 | if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) | ||
| 67 | return true; | ||
