summaryrefslogtreecommitdiffstats
path: root/external/meta-qt5/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch
diff options
context:
space:
mode:
Diffstat (limited to 'external/meta-qt5/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch')
-rw-r--r--external/meta-qt5/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch b/external/meta-qt5/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch
deleted file mode 100644
index 546e23c9..00000000
--- a/external/meta-qt5/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d8b2572813019c7e196cc2a66d7993acbb2d4617 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 14 Apr 2019 13:27:58 +0200
-Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This
-causes massive failures at do_install [2] on qtbase.
-
-To work around tell Qt build configuration not to use ranameet2 independent
-of glibc version.
-
-[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5
-[2] https://github.com/meta-qt5/meta-qt5/issues/187
-
-Upstream-Status: Inappropriate [OE-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/corelib/global/qconfig-bootstrapped.h | 4 ++--
- src/corelib/io/qfilesystemengine_unix.cpp | 10 ----------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
-index 229b4d17a1..4e2d43ffc5 100644
---- a/src/corelib/global/qconfig-bootstrapped.h
-+++ b/src/corelib/global/qconfig-bootstrapped.h
-@@ -100,14 +100,14 @@
- #define QT_FEATURE_process -1
- #define QT_FEATURE_regularexpression -1
- #ifdef __GLIBC_PREREQ
--# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
-+# define QT_FEATURE_renameat2 -1
- #else
- # define QT_FEATURE_renameat2 -1
- #endif
- #define QT_FEATURE_sharedmemory -1
- #define QT_FEATURE_slog2 -1
- #ifdef __GLIBC_PREREQ
--# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
-+# define QT_FEATURE_statx -1
- #else
- # define QT_FEATURE_statx -1
- #endif
-diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index 964dcebeb2..fea7f29c56 100644
---- a/src/corelib/io/qfilesystemengine_unix.cpp
-+++ b/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -1252,16 +1252,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
- if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
- return emptyFileEntryWarning(), false;
-
--#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2)
-- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0)
-- return true;
--
-- // We can also get EINVAL for some non-local filesystems.
-- if (errno != EINVAL) {
-- error = QSystemError(errno, QSystemError::StandardLibraryError);
-- return false;
-- }
--#endif
- #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL)
- if (__builtin_available(macOS 10.12, iOS 10, tvOS 10, watchOS 3, *)) {
- if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0)