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>
This commit is contained in:
Andreas Müller
2020-03-08 12:33:01 +01:00
committed by Martin Jansa
parent f712bf9f88
commit 3e759d8277
5 changed files with 47 additions and 7 deletions

View File

@@ -0,0 +1,39 @@
From 5f5afe275757efe77ff48debb040e08001ea5907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 8 Mar 2020 10:51:48 +0100
Subject: [PATCH] Remove ninja version test for now - it fails for ninja >=
1.10.x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As long as upstream has no better solution, assume we have a ninja version
recent enough
Fixes:
| 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
| + /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
| > 1.10.0
| Ninja version too old
Upstream-Status: Inappropriate [temporary-hack]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.pri | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.pri b/configure.pri
index 3a144e3f..6c3f29fd 100644
--- a/configure.pri
+++ b/configure.pri
@@ -163,8 +163,7 @@ defineTest(qtConfTest_detectNinja) {
!isEmpty(ninja) {
qtLog("Found ninja from path: $$ninja")
qtRunLoggedCommand("$$ninja --version", version)|return(false)
- contains(version, "1.[7-9].*"): return(true)
- qtLog("Ninja version too old")
+ return(true)
}
qtLog("Building own ninja")
return(false)

View File

@@ -1,4 +1,4 @@
From 9f996977ebbb894aa321240cb5590bdae27f14a5 Mon Sep 17 00:00:00 2001
From 455479c661d2ed39882842a623b0aec29bd3c3d9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 12 Dec 2017 16:06:14 +0200
Subject: [PATCH] musl: don't use pvalloc as it's not available on musl

View File

@@ -1,4 +1,4 @@
From 7ed387e99975dc25ced3496c7dd98411f11d28e2 Mon Sep 17 00:00:00 2001
From 507d6323fe871cee981155675cb5ef7cbd253db1 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 14 Dec 2017 11:28:10 +0200
Subject: [PATCH] musl: link against libexecinfo

View File

@@ -1,4 +1,4 @@
From cde19c7f959ff4ea0d2aa202b9c7a048d3c7200e Mon Sep 17 00:00:00 2001
From 6d2e83489770c2eae6d15d06ca9c04667140bb84 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 12 Nov 2019 19:53:59 -0800
Subject: [PATCH] mkspecs: Allow builds with libc != glibc

View File

@@ -145,15 +145,16 @@ RDEPENDS_${PN}-examples += " \
QT_MODULE_BRANCH_CHROMIUM = "77-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14
# 5.14.meta-qt5.2
# 5.14.meta-qt5.3
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-Force-host-toolchain-configuration.patch \
file://0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch \
"
SRC_URI_append_libc-musl = "\
file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
file://0003-musl-link-against-libexecinfo.patch \
file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \
file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
file://0004-musl-link-against-libexecinfo.patch \
file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based