summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-02-19 15:27:44 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-02-21 15:31:15 +0000
commited327d9cd97c0996e0875b0c03f86cbd76232977 (patch)
tree1b1b89d8617badc2e4a9b35af4d3472613b06a12 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parent282f531e63961300be055665acc454356de889fa (diff)
downloadmeta-qt5-ed327d9cd97c0996e0875b0c03f86cbd76232977.tar.gz
qt5: update submodules
Update to latest content in Qt 5.13 branch Task-number: QTBUG-72311 Change-Id: If99527ca97867b99d5273e229d7e98a6cd149f5e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch26
1 files changed, 21 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index b51c4c72..1aaf9498 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001 1From 376b5b262f2ed936920a66167b76edab781ddcff Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -14,11 +14,12 @@ Upstream-Status: Inappropriate [OE specific]
14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
15--- 15---
16 src/buildtools/configure_host.pro | 14 +++++++------- 16 src/buildtools/configure_host.pro | 14 +++++++-------
17 src/buildtools/gn.pro | 4 ++--
17 src/core/config/linux.pri | 2 +- 18 src/core/config/linux.pri | 2 +-
18 2 files changed, 8 insertions(+), 8 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
19 20
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index dd0d3e32..70161c82 100644 22index dd0d3e3..70161c8 100644
22--- a/src/buildtools/configure_host.pro 23--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 24+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 25@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -56,11 +57,26 @@ index dd0d3e32..70161c82 100644
56 " ar = \"$$which(ar)\" " \ 57 " ar = \"$$which(ar)\" " \
57 " nm = \"$$which(nm)\" " \ 58 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 59 " toolchain_args = { " \
60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
61index 7766af0..46defa6 100644
62--- a/src/buildtools/gn.pro
63+++ b/src/buildtools/gn.pro
64@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
65 gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
66
67 gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \
68- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
69- --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\"
70+ --cc \"$$which(gcc)\" --cxx \"$$which(g++)\" \
71+ --ld \"$$which(g++)\" --ar \"$$which(ar)\"
72 message($$gn_configure)
73 !system("$$pythonPathForSystem() $$gn_configure") {
74 error("GN generation error!")
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 85b948db..c529c641 100644 76index 04c9eca..c48fa06 100644
61--- a/src/core/config/linux.pri 77--- a/src/core/config/linux.pri
62+++ b/src/core/config/linux.pri 78+++ b/src/core/config/linux.pri
63@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { 79@@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") {
64 80
65 host_build { 81 host_build {
66 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"