diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2020-03-08 12:33:01 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-03-13 12:07:25 +0100 |
| commit | 3e759d827722de6fddc9449f1149137021f4e25e (patch) | |
| tree | 4b8d5d0c1d70208a9d7df05c6091c6833c56c016 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | f712bf9f8817700d1d6fc663291368df07dacdf1 (diff) | |
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_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ea6d0935..6b54efc6 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -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 |