summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch')
-rw-r--r--meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
deleted file mode 100644
index 84e430b732..0000000000
--- a/meta/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 36657d556e4f97d06aa44d874d7256c970cdad3c Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 15 Mar 2017 13:53:28 +0200
-Subject: [PATCH] Force host toolchain configuration
-
-Force gcc/g++ to be used for parts using host toolchain, since
-the option(host_build) does not work in yocto builds.
-
-Don't use QT_ARCH for the host architecture, since that's always
-the target architecture in bitbake builds, instead ask specifically
-for the qmakes's host architecture.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
----
- src/buildtools/configure_host.pro | 14 +++++++-------
- src/core/config/linux.pri | 2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index dd0d3e3..70161c8 100644
---- a/src/buildtools/configure_host.pro
-+++ b/src/buildtools/configure_host.pro
-@@ -4,7 +4,7 @@ TEMPLATE = aux
- # Pick up the host toolchain
- option(host_build)
-
--GN_HOST_CPU = $$gnArch($$QT_ARCH)
-+GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
- !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
- else: GN_TARGET_CPU = $$GN_HOST_CPU
- GN_OS = $$gnOS()
-@@ -31,9 +31,9 @@ GN_CONTENTS = \
- "import(\"//build/config/sysroot.gni\")" \
- "import(\"//build/toolchain/gcc_toolchain.gni\")" \
- "gcc_toolchain(\"host\") {" \
--" cc = \"$$which($$QMAKE_CC)\" " \
--" cxx = \"$$which($$QMAKE_CXX)\" " \
--" ld = \"$$which($$QMAKE_LINK)\" " \
-+" cc = \"$$which(gcc)\" " \
-+" cxx = \"$$which(g++)\" " \
-+" ld = \"$$which(g++)\" " \
- " ar = \"$$which(ar)\" " \
- " nm = \"$$which(nm)\" " \
- " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
-@@ -45,9 +45,9 @@ GN_CONTENTS = \
- " } " \
- "}" \
- "gcc_toolchain(\"v8_snapshot\") {" \
--" cc = \"$$which($$QMAKE_CC)\" " \
--" cxx = \"$$which($$QMAKE_CXX)\" " \
--" ld = \"$$which($$QMAKE_LINK)\" " \
-+" cc = \"$$which(gcc)\" " \
-+" cxx = \"$$which(g++)\" " \
-+" ld = \"$$which(g++)\" " \
- " ar = \"$$which(ar)\" " \
- " nm = \"$$which(nm)\" " \
- " toolchain_args = { " \
-diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 1ce3ea8..23d0793 100644
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") {
-
- host_build {
- gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
-- GN_HOST_CPU = $$gnArch($$QT_ARCH)
-+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
- gn_args += host_cpu=\"$$GN_HOST_CPU\"
- # Don't bother trying to use system libraries in this case
- gn_args += use_glib=false