diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-21 11:58:45 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-22 17:33:41 +0200 |
commit | c4c70e76c1ead05c32b6089e32c75eb93b42ae55 (patch) | |
tree | 4b72210de8b2b7ac80ab96fcfc25554154c6f1dc /recipes-qt/qt5 | |
parent | b7ae79a05430b4e2e6eecfef8aa2105c3b5e856d (diff) | |
download | meta-qt5-c4c70e76c1ead05c32b6089e32c75eb93b42ae55.tar.gz |
qtwebengine: update 0004-Force-host-toolchain-configuration.patch
* refresh the patch from:
http://code.qt.io/cgit/yocto/meta-qt5.git/diff/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch?id=5bac910f95453d0df6fe540778dd16a9707dcabf
* might fix passing arm specific flags into host builds like:
gcc: error: unrecognized command line option '-mflooat-abi=hard'
strip: unable to recognise the format of the input file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | 35 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch | 2 |
2 files changed, 32 insertions, 5 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 index 258afd53..bda0ba1a 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001 | 1 | From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 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 |
@@ -6,16 +6,30 @@ Subject: [PATCH] Force host toolchain configuration | |||
6 | Force gcc/g++ to be used for parts using host toolchain, since | 6 | Force gcc/g++ to be used for parts using host toolchain, since |
7 | the option(host_build) does not work in yocto builds. | 7 | the option(host_build) does not work in yocto builds. |
8 | 8 | ||
9 | Don't use QT_ARCH for the host architecture, since that's always | ||
10 | the target architecture in bitbake builds, instead ask specifically | ||
11 | for the qmakes's host architecture. | ||
12 | |||
9 | Upstream-Status: Inappropriate [OE specific] | 13 | Upstream-Status: Inappropriate [OE specific] |
10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 14 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
11 | --- | 15 | --- |
12 | src/buildtools/configure_host.pro | 12 ++++++------ | 16 | src/buildtools/configure_host.pro | 14 +++++++------- |
13 | 1 file changed, 6 insertions(+), 6 deletions(-) | 17 | src/core/config/linux.pri | 2 +- |
18 | 2 files changed, 8 insertions(+), 8 deletions(-) | ||
14 | 19 | ||
15 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
16 | index f1b3d47b..521c507b 100644 | 21 | index f1b3d47b..12123729 100644 |
17 | --- a/src/buildtools/configure_host.pro | 22 | --- a/src/buildtools/configure_host.pro |
18 | +++ b/src/buildtools/configure_host.pro | 23 | +++ b/src/buildtools/configure_host.pro |
24 | @@ -4,7 +4,7 @@ TEMPLATE = aux | ||
25 | # Pick up the host toolchain | ||
26 | option(host_build) | ||
27 | |||
28 | -GN_HOST_CPU = $$gnArch($$QT_ARCH) | ||
29 | +GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) | ||
30 | !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) | ||
31 | else: GN_TARGET_CPU = $$GN_HOST_CPU | ||
32 | GN_OS = $$gnOS() | ||
19 | @@ -29,9 +29,9 @@ GN_CONTENTS = \ | 33 | @@ -29,9 +29,9 @@ GN_CONTENTS = \ |
20 | "import(\"//build/config/sysroot.gni\")" \ | 34 | "import(\"//build/config/sysroot.gni\")" \ |
21 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ | 35 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ |
@@ -42,3 +56,16 @@ index f1b3d47b..521c507b 100644 | |||
42 | " ar = \"$$which(ar)\" " \ | 56 | " ar = \"$$which(ar)\" " \ |
43 | " nm = \"$$which(nm)\" " \ | 57 | " nm = \"$$which(nm)\" " \ |
44 | " toolchain_args = { " \ | 58 | " toolchain_args = { " \ |
59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | ||
60 | index 714c864d..f66ca551 100644 | ||
61 | --- a/src/core/config/linux.pri | ||
62 | +++ b/src/core/config/linux.pri | ||
63 | @@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build { | ||
64 | |||
65 | host_build { | ||
66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | ||
67 | - GN_HOST_CPU = $$gnArch($$QT_ARCH) | ||
68 | + GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) | ||
69 | gn_args += host_cpu=\"$$GN_HOST_CPU\" | ||
70 | # Don't bother trying to use system libraries in this case | ||
71 | gn_args += use_glib=false | ||
diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch index 7375ff72..d8d89b8e 100644 --- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch +++ b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001 | 1 | From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sun, 20 Aug 2017 20:37:38 +0200 | 3 | Date: Sun, 20 Aug 2017 20:37:38 +0200 |
4 | Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree | 4 | Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree |