summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch b/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch
deleted file mode 100644
index 3e6a63d5..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 64aa17e9baa2dac2db74c9bd996526d100168b3a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sun, 8 Mar 2020 10:51:48 +0100
4Subject: [PATCH] Remove ninja version test for now - it fails for ninja >=
5 1.10.x
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10As long as upstream has no better solution, assume we have a ninja version
11recent enough
12
13Fixes:
14| Found ninja from path: /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/qtwebengine/5.14.1+gitAUTOINC+73d457481c_a9a20127e8-r0/recipe-sysroot-native/usr/bin/ninja
15| + /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/qtwebengine/5.14.1+gitAUTOINC+73d457481c_a9a20127e8-r0/recipe-sysroot-native/usr/bin/ninja --version
16| > 1.10.0
17| Ninja version too old
18
19Upstream-Status: Inappropriate [temporary-hack]
20
21Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
22---
23 configure.pri | 3 +--
24 1 file changed, 1 insertion(+), 2 deletions(-)
25
26diff --git a/configure.pri b/configure.pri
27index f89df527..2d7d2219 100644
28--- a/configure.pri
29+++ b/configure.pri
30@@ -166,8 +166,7 @@ defineTest(qtConfTest_detectNinja) {
31 !isEmpty(ninja) {
32 qtLog("Found ninja from path: $$ninja")
33 qtRunLoggedCommand("$$ninja --version", version)|return(false)
34- contains(version, "1.[7-9].*"): return(true)
35- qtLog("Ninja version too old")
36+ return(true)
37 }
38 qtLog("Building own ninja")
39 return(false)