summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-03-08 12:33:01 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2020-03-13 12:07:25 +0100
commit3e759d827722de6fddc9449f1149137021f4e25e (patch)
tree4b8d5d0c1d70208a9d7df05c6091c6833c56c016 /recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
parentf712bf9f8817700d1d6fc663291368df07dacdf1 (diff)
downloadmeta-qt5-3e759d827722de6fddc9449f1149137021f4e25e.tar.gz
qtwebengine: Fix build with ninja >= 1.10.0
* For now just skip version check. Looked into: ninja came from meta-oe to oe-core with: commit fc3aef67a95a90e9a485c6b0e93db8cdeab5d3ab Author: Khem Raj <raj.khem@gmail.com> Date: Thu Jul 27 21:52:12 2017 -0700 ninja: Add recipe llvm is using it, therefore move it from meta-oe Signed-off-by: Khem Raj <raj.khem@gmail.com> That was in rocko release cycle. So the assumption we have a ninja decent enough should be acceptable. * and since the upgrade to ninja-1.10.0 in: commit d1cd957cea29f3ab111ae752bc9ad75a1324c255 Author: Upgrade Helper <auh@auh.yoctoproject.org> Date: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> the do_configure task fails with: | ERROR: Feature 'webengine-system-ninja' was enabled, but the pre-condition 'tests.webengine-ninja' failed. * Looked into qtwebengine current dev branch: There is no solution yet. So as soon as upstream offers a better solution most likely this patch will not apply any more and has to be removed then. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
new file mode 100644
index 00000000..06c659c9
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -0,0 +1,26 @@
1From 6d2e83489770c2eae6d15d06ca9c04667140bb84 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Nov 2019 19:53:59 -0800
4Subject: [PATCH] mkspecs: Allow builds with libc != glibc
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 src/buildtools/config/support.pri | 5 -----
9 1 file changed, 5 deletions(-)
10
11diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
12index 5bdd808d..19540787 100644
13--- a/src/buildtools/config/support.pri
14+++ b/src/buildtools/config/support.pri
15@@ -89,11 +89,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
16 return(false)
17 }
18
19- !qtConfig(webengine-system-glibc) {
20- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
21- return(false)
22- }
23-
24 !qtConfig(webengine-system-khr) {
25 qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)")
26 return(false)