diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | 34 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | 14 |
2 files changed, 24 insertions, 24 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 index 610b703f..e5e11036 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 468ed461a955cc1ab3d890178546b79b9d001de9 Mon Sep 17 00:00:00 2001 | 1 | From f1db5849e2af526f1ec9297b42b4b1684f542a29 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 |
@@ -13,13 +13,26 @@ for the qmakes's host architecture. | |||
13 | Upstream-Status: Inappropriate [OE specific] | 13 | Upstream-Status: Inappropriate [OE specific] |
14 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 14 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
15 | --- | 15 | --- |
16 | src/buildtools/config/linux.pri | 2 +- | ||
16 | src/buildtools/configure_host.pro | 14 +++++++------- | 17 | src/buildtools/configure_host.pro | 14 +++++++------- |
17 | src/buildtools/gn.pro | 4 ++-- | 18 | src/buildtools/gn.pro | 4 ++-- |
18 | src/core/config/linux.pri | 2 +- | ||
19 | 3 files changed, 10 insertions(+), 10 deletions(-) | 19 | 3 files changed, 10 insertions(+), 10 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri | ||
22 | index 998aedc..b04db36 100644 | ||
23 | --- a/src/buildtools/config/linux.pri | ||
24 | +++ b/src/buildtools/config/linux.pri | ||
25 | @@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") { | ||
26 | |||
27 | host_build { | ||
28 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | ||
29 | - GN_HOST_CPU = $$gnArch($$QT_ARCH) | ||
30 | + GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) | ||
31 | gn_args += host_cpu=\"$$GN_HOST_CPU\" | ||
32 | # Don't bother trying to use system libraries in this case | ||
33 | gn_args += use_glib=false | ||
21 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 34 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
22 | index dd0d3e32..6312c867 100644 | 35 | index dd0d3e3..6312c86 100644 |
23 | --- a/src/buildtools/configure_host.pro | 36 | --- a/src/buildtools/configure_host.pro |
24 | +++ b/src/buildtools/configure_host.pro | 37 | +++ b/src/buildtools/configure_host.pro |
25 | @@ -4,7 +4,7 @@ TEMPLATE = aux | 38 | @@ -4,7 +4,7 @@ TEMPLATE = aux |
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644 | |||
58 | " nm = \"$$which(nm)\" " \ | 71 | " nm = \"$$which(nm)\" " \ |
59 | " toolchain_args = { " \ | 72 | " toolchain_args = { " \ |
60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro | 73 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro |
61 | index b6bf9cfc..ae419b1a 100644 | 74 | index 033202e..a8ca656 100644 |
62 | --- a/src/buildtools/gn.pro | 75 | --- a/src/buildtools/gn.pro |
63 | +++ b/src/buildtools/gn.pro | 76 | +++ b/src/buildtools/gn.pro |
64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { | 77 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { |
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644 | |||
72 | 85 | ||
73 | msvc:!clang_cl: gn_gen_args += --use-lto | 86 | msvc:!clang_cl: gn_gen_args += --use-lto |
74 | 87 | ||
75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | ||
76 | index fcce4c31..e3384e58 100644 | ||
77 | --- a/src/core/config/linux.pri | ||
78 | +++ b/src/core/config/linux.pri | ||
79 | @@ -117,7 +117,7 @@ contains(QT_ARCH, "mips") { | ||
80 | |||
81 | host_build { | ||
82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | ||
83 | - GN_HOST_CPU = $$gnArch($$QT_ARCH) | ||
84 | + GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) | ||
85 | gn_args += host_cpu=\"$$GN_HOST_CPU\" | ||
86 | # Don't bother trying to use system libraries in this case | ||
87 | gn_args += use_glib=false | ||
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch index 3047230c..f464f4a6 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From a1c248259f3d8561d6e2c75a56edf4a72c393843 Mon Sep 17 00:00:00 2001 | 1 | From 5a1d55ce93a51b35b7c409bcf778a6439ab34906 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: Thu, 15 Aug 2019 07:52:53 +0300 | 3 | Date: Thu, 15 Aug 2019 07:52:53 +0300 |
4 | Subject: [PATCH] musl: allow build without glibc | 4 | Subject: [PATCH] musl: allow build without glibc |
5 | 5 | ||
6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
7 | --- | 7 | --- |
8 | mkspecs/features/configure.prf | 2 +- | 8 | mkspecs/features/functions.prf | 2 +- |
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 11 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf |
12 | index cc84182b..f1310f75 100644 | 12 | index a301929..15e7110 100644 |
13 | --- a/mkspecs/features/configure.prf | 13 | --- a/mkspecs/features/functions.prf |
14 | +++ b/mkspecs/features/configure.prf | 14 | +++ b/mkspecs/features/functions.prf |
15 | @@ -75,7 +75,7 @@ defineTest(runConfigure) { | 15 | @@ -167,7 +167,7 @@ defineTest(isWebEngineCoreBuild) { |
16 | return(false) | 16 | return(false) |
17 | } | 17 | } |
18 | 18 | ||