diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-09 20:42:22 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 12:55:06 +0000 |
commit | d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169 (patch) | |
tree | 6c810c8520ebcb9637578e478815bc5081dafc1f /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
parent | f705a8a47e542a5819380f024c92e43eebf08f5e (diff) | |
parent | 51e07805e0cf8f53bc9609854d1afd5e51494151 (diff) | |
download | meta-qt5-d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
In addition to commits below, fixed PV value to "5.12.1" in qt5-git.inc
* upstream/master:
51e0780 qtbase: replace the fix for gcc-4.8 with the one from upstream
c67abd6 qtbase: Fix build with gcc 4.8
f69fc40 qtwebengine: Fix build with musl/gcc9
7cc177d qtwebkit-examples: drop recipe
1b755b2 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
5443af9 qtwayland: revert one patch from 5.12 branch to make it compatible with 5.12.0 qtbase
bd9d830 qt3d-runtime: drop patch resolved upstream
44f4fc3 qt5everywheredemo: add dependency on qtxmlpatterns
77edae5 qtconnectivity: drop patch resolved upstream
d45b966 qtwebengine: update chromium musl patchset
8c7797b qtbase: add env variable for host bin suffix
f1a5e8a qtwebengine: include sources in the debug package, add x11 PACKAGECONFIG
2be2731 libqofono: add dependency on qtxmlpatterns
725fc1f qtxmlpatterns: add qtdeclarative PACKAGECONFIG
b7b0a78 qtdeclarative: remove qtxmlpatterns PACKAGECONFIG
57aab31 qtwayland: update PACKAGECONFIG options
299a326 qtbase: update xinput PACKAGECONFIG
6531fa7 qtbase: use v5.12.0 as base
c8d5ef5 qt5: upgrade to latest revision in 5.12
c6be23d qt5: upgrade to latest revision in 5.12
201fcf2 qt5-plugin-generic-vboxtouch: fix segfault
5b35f89 qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
808d65c qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
a55a993 libconnman-qt5: Don't harcode libdir to fix multilib build
c483f15 qtbase: Fix build with gcc9
b725e6d qtbase: Consider clang when computing QMAKE_CXX.COMPILER_MACROS
7016481 qt5-creator: Enable clang plugin support when clang is used as toolchain
ba03a76 qtwebkit: Fix build with clang
7223816 maliit: Disable tests
4c3d66f qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file
f2d7b94 qtconnectivity: Ignore -Waddress-of-temporary when using clang
b8fade9 qtbase: Fix build with clang/musl
0cdf727 qt5: upgrade to 5.11.3
9fc65c0 qtwebengine: Configure Ninja to honor PARALLEL_MAKE
010a29e qmllive: add new recipe
f227502 python-pyqt5: MAKEFLAGS pass -j 1 via MAKEFLAGS during do_install
fe453ec packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found
18f82a8 python-pyqt5: Disable parallel install
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch
recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ic896ea4ae0f64daaedc43a6736fc0243599f05f6
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 | 71 |
1 files changed, 71 insertions, 0 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 new file mode 100644 index 00000000..b51c4c72 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | From a321d1b96ce0563a08d0bb44c39d24f86608f6ae 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 | 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 | |||
13 | Upstream-Status: Inappropriate [OE specific] | ||
14 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
15 | --- | ||
16 | src/buildtools/configure_host.pro | 14 +++++++------- | ||
17 | src/core/config/linux.pri | 2 +- | ||
18 | 2 files changed, 8 insertions(+), 8 deletions(-) | ||
19 | |||
20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | ||
21 | index dd0d3e32..70161c82 100644 | ||
22 | --- a/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() | ||
33 | @@ -31,9 +31,9 @@ GN_CONTENTS = \ | ||
34 | "import(\"//build/config/sysroot.gni\")" \ | ||
35 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ | ||
36 | "gcc_toolchain(\"host\") {" \ | ||
37 | -" cc = \"$$which($$QMAKE_CC)\" " \ | ||
38 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ | ||
39 | -" ld = \"$$which($$QMAKE_LINK)\" " \ | ||
40 | +" cc = \"$$which(gcc)\" " \ | ||
41 | +" cxx = \"$$which(g++)\" " \ | ||
42 | +" ld = \"$$which(g++)\" " \ | ||
43 | " ar = \"$$which(ar)\" " \ | ||
44 | " nm = \"$$which(nm)\" " \ | ||
45 | " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ | ||
46 | @@ -45,9 +45,9 @@ GN_CONTENTS = \ | ||
47 | " } " \ | ||
48 | "}" \ | ||
49 | "gcc_toolchain(\"v8_snapshot\") {" \ | ||
50 | -" cc = \"$$which($$QMAKE_CC)\" " \ | ||
51 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ | ||
52 | -" ld = \"$$which($$QMAKE_LINK)\" " \ | ||
53 | +" cc = \"$$which(gcc)\" " \ | ||
54 | +" cxx = \"$$which(g++)\" " \ | ||
55 | +" ld = \"$$which(g++)\" " \ | ||
56 | " ar = \"$$which(ar)\" " \ | ||
57 | " nm = \"$$which(nm)\" " \ | ||
58 | " toolchain_args = { " \ | ||
59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | ||
60 | index 85b948db..c529c641 100644 | ||
61 | --- a/src/core/config/linux.pri | ||
62 | +++ b/src/core/config/linux.pri | ||
63 | @@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { | ||
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 | ||