diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-15 12:10:22 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-15 15:44:01 +0200 |
commit | ff6127ddd318d422f595295d1c189a86b3032873 (patch) | |
tree | f3c25ef68a18af1658229c5e5dc2687456809fe0 /recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch | |
parent | 6b354b933c526015c1c98e2334cdb29cb5e489e1 (diff) | |
parent | fd1f0f47312e7ee80e5ca65b8b2992cb068b1656 (diff) | |
download | meta-qt5-ff6127ddd318d422f595295d1c189a86b3032873.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
fd1f0f4 python-pyqt5: Update to 5.11.3 and add python3 recipe.
3fa1993 qtbase-native: disable postgresql support
0edbe1b qtbase: refresh patches and update tags on meta-qt5
4ed4385 qtbase: don't leak absolut path to recipe specific sysroot
b3502fb qt5: Disable ltcg for host_build
5832bf2 qtbase: don't use thumb for armv[45]
Task-number: QTBUG-71658
Change-Id: Ied518deb11fb41e9f91c58419a6efee37a4086d4
Diffstat (limited to 'recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..16923cd4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 0d6a38d7bec0a3017a9e325f5e2b6e6168359b33 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 | ||