summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-18 15:44:26 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-11-18 15:45:10 +0200
commit12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch)
tree5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
parent3e502778ee161bef4177e7e7f45c0c9b78d047da (diff)
parent432ad2aa6c3a13253fefc909faba368851d21fb1 (diff)
downloadmeta-qt5-5.13.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus: 432ad2a qttools: don't install tst_qtattributionsscanner 8115617 qt5: Upgrade to Qt 5.13.2 267e646 python(3)-pyqt5: add qml support 653e12f libqofono: bump SRCREV and add a fix for voicecall cefb48e qtbase: Add PACKAGECONFIG for lttng 911b346 layer: Mark zeus as compatible release c373272 ogl-runtime: Fix build on x86_64 9172ba1 README.md: Document need for 32bit host compiler db2fd6c qtwayland: Fix build with clang/libc++ 6b5122e qtbase: Fix build when fp16 is used Conflicts: recipes-qt/qt5/ogl-runtime_git.bb recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
index e0591d2a..7c77805d 100644
--- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
+++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
1From a080cb3ac2ad24aeb73407c772ed560dc4cb7ef5 Mon Sep 17 00:00:00 2001 1From 7804eb38b11b3a03217a6505d4b64c335d5a1d0d Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 23 Oct 2018 09:54:57 +0300 3Date: Tue, 23 Oct 2018 09:54:57 +0300
4Subject: [PATCH] Disable ltcg for host_build 4Subject: [PATCH] Disable ltcg for host_build
@@ -15,7 +15,7 @@ Upstream-Status: Inappropriate [embedded specific]
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf 17diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
18index a94f6d0eeb..3cb01c334d 100644 18index a94f6d0eeb..ccab725843 100644
19--- a/mkspecs/features/ltcg.prf 19--- a/mkspecs/features/ltcg.prf
20+++ b/mkspecs/features/ltcg.prf 20+++ b/mkspecs/features/ltcg.prf
21@@ -1,6 +1,6 @@ 21@@ -1,6 +1,6 @@