From 3e759d827722de6fddc9449f1149137021f4e25e Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 8 Mar 2020 12:33:01 +0100 Subject: qtwebengine: Fix build with ninja >= 1.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * For now just skip version check. Looked into: ninja came from meta-oe to oe-core with: commit fc3aef67a95a90e9a485c6b0e93db8cdeab5d3ab Author: Khem Raj 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 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 Date: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie 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 --- .../0003-musl-link-against-libexecinfo.patch | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch (limited to 'recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch') diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch deleted file mode 100644 index a2dce542..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7ed387e99975dc25ced3496c7dd98411f11d28e2 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 14 Dec 2017 11:28:10 +0200 -Subject: [PATCH] musl: link against libexecinfo - -Change-Id: Ifada60f9c72691973612850121f6fb152d70839a -Signed-off-by: Samuli Piippo ---- - src/core/core_module.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 4b9268e1..be04b160 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -58,7 +58,7 @@ linux { - POST_TARGETDEPS += $$NINJA_TARGETDEPS - - --LIBS_PRIVATE += -L$$api_library_path -+LIBS_PRIVATE += -L$$api_library_path -lexecinfo - CONFIG *= no_smart_library_merge - osx { - LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a -- cgit v1.2.3-54-g00ecf