summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-15 08:29:53 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-15 08:46:49 +0000
commitfc3f8ff4c82796a7708640f110aef66f421846a5 (patch)
tree81e2492f3873e3beaa2913216f05ca31319fefd9
parent5fdfbec8369f990bd4b9def1294ade6bbf60e143 (diff)
downloadmeta-qt5-fc3f8ff4c82796a7708640f110aef66f421846a5.tar.gz
qtwebengine: allow build for musl libc
Change-Id: I5a772ff58ba1f1315a6b3b7b42b5a43db8f9d8bd Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch23
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb1
2 files changed, 24 insertions, 0 deletions
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
new file mode 100644
index 00000000..3047230c
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch
@@ -0,0 +1,23 @@
1From a1c248259f3d8561d6e2c75a56edf4a72c393843 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 15 Aug 2019 07:52:53 +0300
4Subject: [PATCH] musl: allow build without glibc
5
6Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
7---
8 mkspecs/features/configure.prf | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
12index cc84182b..f1310f75 100644
13--- a/mkspecs/features/configure.prf
14+++ b/mkspecs/features/configure.prf
15@@ -75,7 +75,7 @@ defineTest(runConfigure) {
16 return(false)
17 }
18
19- !qtConfig(webengine-system-glibc) {
20+ false:!qtConfig(webengine-system-glibc) {
21 skipBuild("A suitable version >= 2.27 of libc could not be found.")
22 return(false)
23 }
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 5d6f7b7f..54026cfa 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -143,6 +143,7 @@ SRC_URI += " \
143SRC_URI_append_libc-musl = "\ 143SRC_URI_append_libc-musl = "\
144 file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ 144 file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
145 file://0003-musl-link-against-libexecinfo.patch \ 145 file://0003-musl-link-against-libexecinfo.patch \
146 file://0004-musl-allow-build-without-glibc.patch \
146" 147"
147 148
148# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based 149# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based