diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:25:55 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:31:38 +0300 |
commit | 0106f58f31df6b426dca2bb810fed5009d4cb28f (patch) | |
tree | a84de94177cb0c9ae65628d0875ebe90365a2254 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
parent | e990651e683b47e60fc981dc4edb285a795ae490 (diff) | |
parent | 17fb7499c12764264212b1a28eb5782c741964d5 (diff) | |
download | meta-qt5-0106f58f31df6b426dca2bb810fed5009d4cb28f.tar.gz |
Merge remote-tracking branch 'qtyocto/5.13' into dev
* qtyocto/5.13: (46 commits)
qtwayland: update module
qt5: update submodules
qt5: update submodules
qt3d-runtime: update to v2.3
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
qtbase: add libxext dependency for xcb PACKAGECONFIG
python-pyqt5: Update to version 5.12.1.
python-pyqt: Fix annoying problems.
qtwebengine: arm: use OE specified -mcpu option
Revert "qtbase: Adjust target mkspec settings"
qtbase-tools: Fix error during pkg_postinst
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
qtwayland: check also that the destination for private headers exists before installing them
qtwayland: improve manual header installation
qtwayland: workaround upstream bug: install missing headers manually
qtwayland: disable gold for all archs like in qtbase
qt5: upgrade to 5.12.3
qtbase: disable gold for all archs not just x86
...
Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75
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.patch | 26 |
1 files changed, 13 insertions, 13 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 544e5ebe..d15af51e 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 @@ | |||
1 | From 4bd5ee8a79729c29795568568a9cd7a01d9c338b Mon Sep 17 00:00:00 2001 | 1 | From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
19 | 3 files changed, 10 insertions(+), 10 deletions(-) | 19 | 3 files changed, 10 insertions(+), 10 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 21 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
22 | index dd0d3e3..6312c86 100644 | 22 | index dd0d3e32..6312c867 100644 |
23 | --- a/src/buildtools/configure_host.pro | 23 | --- a/src/buildtools/configure_host.pro |
24 | +++ b/src/buildtools/configure_host.pro | 24 | +++ b/src/buildtools/configure_host.pro |
25 | @@ -4,7 +4,7 @@ TEMPLATE = aux | 25 | @@ -4,7 +4,7 @@ TEMPLATE = aux |
@@ -58,25 +58,25 @@ index dd0d3e3..6312c86 100644 | |||
58 | " nm = \"$$which(nm)\" " \ | 58 | " nm = \"$$which(nm)\" " \ |
59 | " toolchain_args = { " \ | 59 | " toolchain_args = { " \ |
60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro | 60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro |
61 | index 30ada93..afd115c 100644 | 61 | index b6bf9cf..ae419b1 100644 |
62 | --- a/src/buildtools/gn.pro | 62 | --- a/src/buildtools/gn.pro |
63 | +++ b/src/buildtools/gn.pro | 63 | +++ b/src/buildtools/gn.pro |
64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { | 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)) | 65 | gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) |
66 | 66 | ||
67 | gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ | 67 | gn_gen_args = --no-last-commit-position --out-path $$out_path \ |
68 | - --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ | 68 | - --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ |
69 | - --ld \"$$which($$QMAKE_LINK)\" | 69 | - --ld \"$$which($$QMAKE_LINK)\" |
70 | + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ | 70 | + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ |
71 | + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" | 71 | + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" |
72 | macos { | 72 | |
73 | gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" | 73 | msvc:!clang_cl: gn_gen_args += --use-lto |
74 | } | 74 | |
75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
76 | index 04c9eca..c48fa06 100644 | 76 | index 95b7a4b..db0658e 100644 |
77 | --- a/src/core/config/linux.pri | 77 | --- a/src/core/config/linux.pri |
78 | +++ b/src/core/config/linux.pri | 78 | +++ b/src/core/config/linux.pri |
79 | @@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") { | 79 | @@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") { |
80 | 80 | ||
81 | host_build { | 81 | host_build { |
82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | 82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |