summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch16
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch2
3 files changed, 10 insertions, 10 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 7136b475..8de23c76 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 @@
1From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 1From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
18 2 files changed, 8 insertions(+), 8 deletions(-) 18 2 files changed, 8 insertions(+), 8 deletions(-)
19 19
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index dd0d3e32..70161c82 100644 21index dd0d3e32..6312c867 100644
22--- a/src/buildtools/configure_host.pro 22--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 23+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 24@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -37,9 +37,9 @@ index dd0d3e32..70161c82 100644
37-" cc = \"$$which($$QMAKE_CC)\" " \ 37-" cc = \"$$which($$QMAKE_CC)\" " \
38-" cxx = \"$$which($$QMAKE_CXX)\" " \ 38-" cxx = \"$$which($$QMAKE_CXX)\" " \
39-" ld = \"$$which($$QMAKE_LINK)\" " \ 39-" ld = \"$$which($$QMAKE_LINK)\" " \
40+" cc = \"$$which(gcc)\" " \ 40+" cc = \"$$which($$CC_host)\" " \
41+" cxx = \"$$which(g++)\" " \ 41+" cxx = \"$$which($$CXX_host)\" " \
42+" ld = \"$$which(g++)\" " \ 42+" ld = \"$$which($$CXX_host)\" " \
43 " ar = \"$$which(ar)\" " \ 43 " ar = \"$$which(ar)\" " \
44 " nm = \"$$which(nm)\" " \ 44 " nm = \"$$which(nm)\" " \
45 " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ 45 " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
@@ -50,9 +50,9 @@ index dd0d3e32..70161c82 100644
50-" cc = \"$$which($$QMAKE_CC)\" " \ 50-" cc = \"$$which($$QMAKE_CC)\" " \
51-" cxx = \"$$which($$QMAKE_CXX)\" " \ 51-" cxx = \"$$which($$QMAKE_CXX)\" " \
52-" ld = \"$$which($$QMAKE_LINK)\" " \ 52-" ld = \"$$which($$QMAKE_LINK)\" " \
53+" cc = \"$$which(gcc)\" " \ 53+" cc = \"$$which($$CC_host)\" " \
54+" cxx = \"$$which(g++)\" " \ 54+" cxx = \"$$which($$CXX_host)\" " \
55+" ld = \"$$which(g++)\" " \ 55+" ld = \"$$which($$CXX_host)\" " \
56 " ar = \"$$which(ar)\" " \ 56 " ar = \"$$which(ar)\" " \
57 " nm = \"$$which(nm)\" " \ 57 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 58 " toolchain_args = { " \
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
index c244a864..07092012 100644
--- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -1,4 +1,4 @@
1From 9409b83e634b53eb59cc0935424ea6fca1f50491 Mon Sep 17 00:00:00 2001 1From b3125c1b3f32915aa80acf58a9d1eeab4e260b17 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 12 Dec 2017 16:06:14 +0200 3Date: Tue, 12 Dec 2017 16:06:14 +0200
4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl 4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index 6b78f4ef..6dc7f0cb 100644
--- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
1From a24cb0ef3b7311719ec248f4f1771f192c7cf4a0 Mon Sep 17 00:00:00 2001 1From 983ba7f8f80165ade5347544f1e975bd6b67549e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 14 Dec 2017 11:28:10 +0200 3Date: Thu, 14 Dec 2017 11:28:10 +0200
4Subject: [PATCH] musl: link against libexecinfo 4Subject: [PATCH] musl: link against libexecinfo