From 5b35f89219e5b4a2bc0792d429c93b0bbc9c6898 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 18 Dec 2018 20:37:21 +0000 Subject: qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes * in preparation for rebase on 5.12 #136 Signed-off-by: Martin Jansa --- .../0003-Force-host-toolchain-configuration.patch | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch (limited to 'recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch') diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch deleted file mode 100644 index 649c7447..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 9e88d83104e8d3c5b093e52c9af9829092b79148 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -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 ---- - 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 dd0d3e32..70161c82 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 4ade2827..cad3d7bf 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -92,7 +92,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 -- cgit v1.2.3-54-g00ecf