diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-02 12:55:00 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 11:03:12 +0300 |
commit | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (patch) | |
tree | b929ba359171175a23f3c10bb4ba199b00c17f4a /recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch | |
parent | f087aeb1e988fcb0597fcf2b27981b1803909276 (diff) | |
parent | 8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 (diff) | |
download | meta-qt5-89ac66bf3969b48eb771ef4c06a0b8df00fd178a.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtyocto/upstream/warrior:
8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
7dc422d qtwayland: check also that the destination for private headers exists before installing them
84d647a qtwayland: improve manual header installation
3d60f9a qtwayland: workaround upstream bug: install missing headers manually
eb5d6da qtwayland: disable gold for all archs like in qtbase
e2707a0 qt5: upgrade to 5.12.3
0778424 qtbase: disable gold for all archs not just x86
4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
a4bf240 qtbase-native: add native libdir to search path
adf7f60 qt5: patch build paths from installed files
28d4bfd Upgrade to 5.12.2
5a32838 layer.conf: Add warrior to compatible release series
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I085dfdddbf7915f776bd48a6d26ecf96777d9d19
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; | ||