diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-03 14:27:39 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-03 14:27:39 +0200 |
commit | 6b2323f39b5ddf0580f3d0e2c31b5609327f509c (patch) | |
tree | 90203f3013ff0fabd9b3d54ef829a1369b35a9aa /recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch | |
parent | 20ae10f00fbf580183742119b92cc872a4ecd75c (diff) | |
download | meta-qt5-6b2323f39b5ddf0580f3d0e2c31b5609327f509c.tar.gz |
qtwebengine: update patches for beta2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch | 39 |
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 @@ | |||
1 | From 64aa17e9baa2dac2db74c9bd996526d100168b3a Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Sun, 8 Mar 2020 10:51:48 +0100 | ||
4 | Subject: [PATCH] Remove ninja version test for now - it fails for ninja >= | ||
5 | 1.10.x | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | As long as upstream has no better solution, assume we have a ninja version | ||
11 | recent enough | ||
12 | |||
13 | Fixes: | ||
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 | |||
19 | Upstream-Status: Inappropriate [temporary-hack] | ||
20 | |||
21 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
22 | --- | ||
23 | configure.pri | 3 +-- | ||
24 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/configure.pri b/configure.pri | ||
27 | index 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) | ||