diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:32:00 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 17:07:33 +0300 |
commit | 1b356a70d61547992d51025e6a1b6edb48886bb6 (patch) | |
tree | f11b34a8e39e37fb3017ddb5c3119dfd6f011022 /recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch | |
parent | 78b8872328a2162c1030831a36d0814da6c200a5 (diff) | |
parent | 9ffdd55c7c03d9e608409a95ed4c51ae0fb3d511 (diff) | |
download | meta-qt5-1b356a70d61547992d51025e6a1b6edb48886bb6.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
qtscript: Update the custom patch from mainline
qtbase: remove renameat2 PACKAGECONFIG
qtbase: fix build with glibc-2.28 - for non-readers like me
qtwebengine: Fix optonal glib-2.0 dependency
qtwebkit_git.bb: Fix configure failure on bison
qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
qtwebengine: add a package config to enable proprietary codecs
qt3d-runtime: add recipe for Qt 3D Studio runtime library
qtbase: update the dependency for gbm PACKAGECONFIG
qtbase: fix build with glibc-2.28
nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
qtchooser: drop useless patch, set PV
packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
qtbase: Add a kde PACKAGECONFIG
Change-Id: I8b407611ee7473bbd00ece06f6613d93ca56ca0d
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 | ||