summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-11-16 10:19:45 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2018-11-16 11:15:30 +0200
commit96685678ddb4adf615d037dd4c1dcca23023df19 (patch)
tree41480f2608c514cc1308445e413cfe06e9e91da3 /recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch
parentf0ca39edb8dd0524e8822da813399cce2e70ef53 (diff)
parentff6127ddd318d422f595295d1c189a86b3032873 (diff)
downloadmeta-qt5-96685678ddb4adf615d037dd4c1dcca23023df19.tar.gz
Merge remote-tracking branch 'qtyocto/5.11' into 5.12
* qtyocto/5.11: ff6127d Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11 6b354b9 qt5: update submodules 4064b3b qtdeclarative: fix inconsistent QML_COMPILE_HASH value 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] Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.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/qtlocation_git.b b recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_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 Task-number: QTBUG-70847 Change-Id: I67e23c7020276516fcace20ff6a1eb698724dd22
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.patch27
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 @@
1From 0d6a38d7bec0a3017a9e325f5e2b6e6168359b33 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature
5
6qmake does not work together with pseudo when unnamed temporary files
7are used with linkat.
8
9Upstream-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
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index 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