diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 12:26:29 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 13:30:15 +0300 |
commit | a34f936566039c2cba6a0e58192398255a0653b8 (patch) | |
tree | 609467ab742ba1b01d4eb9a3999587454086f24b /recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch | |
parent | fa6bdc2e91ddb6755d7ce463b623b4eed706d438 (diff) | |
parent | 3439f344fbb4c1ee2b13ddb54435716c53d79be2 (diff) | |
download | meta-qt5-a34f936566039c2cba6a0e58192398255a0653b8.tar.gz |
Merge remote-tracking branch 'qtyocto/5.11' into 5.12
* qtyocto/5.11:
3439f34 qtbase: update changelog
0bc53eb qt5: update submodules
1b356a7 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
9ffdd55 qtscript: Update the custom patch from mainline
95d64ea qtbase: remove renameat2 PACKAGECONFIG
2d1d807 qtbase: fix build with glibc-2.28 - for non-readers like me
e4abbde qtwebengine: Fix optonal glib-2.0 dependency
1fb8aff qtwebkit_git.bb: Fix configure failure on bison
cb7dfcc qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
70b090a qtwebengine: add a package config to enable proprietary codecs
bb38f64 qt3d-runtime: add recipe for Qt 3D Studio runtime library
75e2d3a qtbase: update the dependency for gbm PACKAGECONFIG
539e4f0 qtbase: fix build with glibc-2.28
c2e4ec6 nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
4587cc3 qtchooser: drop useless patch, set PV
3a4ad54 packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
2736dcf qtbase: Add a kde PACKAGECONFIG
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
Change-Id: Ic58c0577f9df0aaac613befeacb1db98c6af5d17
Diffstat (limited to 'recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..4f5fdc95 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 | ||
4 | Subject: [PATCH] Bootstrap without linkat feature | ||
5 | |||
6 | qmake does not work together with pseudo when unnamed temporary files | ||
7 | are used with linkat. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | [YOCTO #11996] | ||
11 | --- | ||
12 | src/corelib/global/qconfig-bootstrapped.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | ||
16 | index c5585ea32a..de895e7bf4 100644 | ||
17 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
19 | @@ -90,7 +90,7 @@ | ||
20 | #define QT_FEATURE_itemmodel -1 | ||
21 | #define QT_FEATURE_library -1 | ||
22 | #ifdef __linux__ | ||
23 | -# define QT_FEATURE_linkat 1 | ||
24 | +# define QT_FEATURE_linkat -1 | ||
25 | #else | ||
26 | # define QT_FEATURE_linkat -1 | ||
27 | #endif | ||