diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-09 09:34:09 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:05 +0200 |
commit | 969f1f80bf255498abbec6886d443670c20a79c8 (patch) | |
tree | 45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | |
parent | 648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff) | |
download | meta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz |
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch new file mode 100644 index 00000000..142595a3 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | ||
4 | Subject: [PATCH] Force host toolchain configuration | ||
5 | |||
6 | Force gcc/g++ to be used for parts using host toolchain, since | ||
7 | the option(host_build) does not work in yocto builds. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
11 | --- | ||
12 | src/buildtools/configure_host.pro | 12 ++++++------ | ||
13 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
14 | |||
15 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | ||
16 | index fd27643e..f9acb6ff 100644 | ||
17 | --- a/src/buildtools/configure_host.pro | ||
18 | +++ b/src/buildtools/configure_host.pro | ||
19 | @@ -28,9 +28,9 @@ GN_CONTENTS = \ | ||
20 | "import(\"//build/config/sysroot.gni\")" \ | ||
21 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ | ||
22 | "gcc_toolchain(\"host\") {" \ | ||
23 | -" cc = \"$$which($$QMAKE_CC)\" " \ | ||
24 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ | ||
25 | -" ld = \"$$which($$QMAKE_LINK)\" " \ | ||
26 | +" cc = \"$$which(gcc)\" " \ | ||
27 | +" cxx = \"$$which(g++)\" " \ | ||
28 | +" ld = \"$$which(g++)\" " \ | ||
29 | " ar = \"$$which(ar)\" " \ | ||
30 | " nm = \"$$which(nm)\" " \ | ||
31 | " toolchain_args = { " \ | ||
32 | @@ -41,9 +41,9 @@ GN_CONTENTS = \ | ||
33 | " } " \ | ||
34 | "}" \ | ||
35 | "gcc_toolchain(\"v8_snapshot\") {" \ | ||
36 | -" cc = \"$$which($$QMAKE_CC)\" " \ | ||
37 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ | ||
38 | -" ld = \"$$which($$QMAKE_LINK)\" " \ | ||
39 | +" cc = \"$$which(gcc)\" " \ | ||
40 | +" cxx = \"$$which(g++)\" " \ | ||
41 | +" ld = \"$$which(g++)\" " \ | ||
42 | " ar = \"$$which(ar)\" " \ | ||
43 | " nm = \"$$which(nm)\" " \ | ||
44 | " toolchain_args = { " \ | ||