summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-06 08:07:33 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-06 08:07:33 +0300
commit7d0ec758e43f46f067464da0a4f4f94dbfec9556 (patch)
treea7f3d2c0b284ab8d52bd7ee229e0052394cf98ed /recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
parent1716c294770b10e41af1b11cbe820ca857168556 (diff)
parentc1deb9aafe5fe20de1175944ed863e6d94dad71b (diff)
downloadmeta-qt5-7d0ec758e43f46f067464da0a4f4f94dbfec9556.tar.gz
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12: ogl-runtime: Fix format-security issues ogl-runtime: fix build errors qtvirtualkeyboard: update supported layouts qt3d-runtime: update to ogl-runtime v2.4 qtbase: update module qt5: update submodules qt5: update submodules qtbase: fix build with gcc-9 qtlocation: add PACKAGECONFIGs for geoservices qmake5_base.bbclass: Don't expand find -name search patterns qt5: update submodules Change-Id: Id6648d939ba54df0719660ace40d45fa3f1e1fbe
Diffstat (limited to 'recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
new file mode 100644
index 00000000..e681bfbb
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
@@ -0,0 +1,27 @@
1From d52010c7d58f1a25f51a909b3179df656ed9d9c4 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 30166fe41c..e06f75541b 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -91,7 +91,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