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 --- ...a-version-test-for-now-it-fails-for-ninja.patch | 39 ++++++++++++++++++++++ ...use-pvalloc-as-it-s-not-available-on-musl.patch | 37 -------------------- ...use-pvalloc-as-it-s-not-available-on-musl.patch | 37 ++++++++++++++++++++ .../0003-musl-link-against-libexecinfo.patch | 24 ------------- ...0004-mkspecs-Allow-builds-with-libc-glibc.patch | 26 --------------- .../0004-musl-link-against-libexecinfo.patch | 24 +++++++++++++ ...0005-mkspecs-Allow-builds-with-libc-glibc.patch | 26 +++++++++++++++ recipes-qt/qt5/qtwebengine_git.bb | 9 ++--- 8 files changed, 131 insertions(+), 91 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch create mode 100644 recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch (limited to 'recipes-qt/qt5') 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 new file mode 100644 index 00000000..89014da3 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch @@ -0,0 +1,39 @@ +From 5f5afe275757efe77ff48debb040e08001ea5907 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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) diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch deleted file mode 100644 index ea536aff..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9f996977ebbb894aa321240cb5590bdae27f14a5 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 12 Dec 2017 16:06:14 +0200 -Subject: [PATCH] musl: don't use pvalloc as it's not available on musl - -Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 -Signed-off-by: Samuli Piippo ---- - src/core/api/qtbug-61521.cpp | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp -index 002a1af2..8fd2da36 100644 ---- a/src/core/api/qtbug-61521.cpp -+++ b/src/core/api/qtbug-61521.cpp -@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); - void* __valloc(size_t size) - SHIM_ALIAS_SYMBOL(ShimValloc); - --SHIM_SYMBOL_VERSION(pvalloc); --void* __pvalloc(size_t size) -- SHIM_ALIAS_SYMBOL(ShimPvalloc); -- - SHIM_SYMBOL_VERSION(posix_memalign); - int __posix_memalign(void** r, size_t a, size_t s) - SHIM_ALIAS_SYMBOL(ShimPosixMemalign); -@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { - return valloc(size); - } - --SHIM_HIDDEN void* ShimPvalloc(size_t size) { -- return pvalloc(size); --} -- - SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { - return posix_memalign(r,a,s); - } diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch new file mode 100644 index 00000000..df52bdc8 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -0,0 +1,37 @@ +From 455479c661d2ed39882842a623b0aec29bd3c3d9 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 12 Dec 2017 16:06:14 +0200 +Subject: [PATCH] musl: don't use pvalloc as it's not available on musl + +Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 +Signed-off-by: Samuli Piippo +--- + src/core/api/qtbug-61521.cpp | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp +index 002a1af2..8fd2da36 100644 +--- a/src/core/api/qtbug-61521.cpp ++++ b/src/core/api/qtbug-61521.cpp +@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); + void* __valloc(size_t size) + SHIM_ALIAS_SYMBOL(ShimValloc); + +-SHIM_SYMBOL_VERSION(pvalloc); +-void* __pvalloc(size_t size) +- SHIM_ALIAS_SYMBOL(ShimPvalloc); +- + SHIM_SYMBOL_VERSION(posix_memalign); + int __posix_memalign(void** r, size_t a, size_t s) + SHIM_ALIAS_SYMBOL(ShimPosixMemalign); +@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { + return valloc(size); + } + +-SHIM_HIDDEN void* ShimPvalloc(size_t size) { +- return pvalloc(size); +-} +- + SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { + return posix_memalign(r,a,s); + } 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 diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch deleted file mode 100644 index 8f25c687..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cde19c7f959ff4ea0d2aa202b9c7a048d3c7200e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Nov 2019 19:53:59 -0800 -Subject: [PATCH] mkspecs: Allow builds with libc != glibc - -Signed-off-by: Khem Raj ---- - src/buildtools/config/support.pri | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index 5bdd808d..19540787 100644 ---- a/src/buildtools/config/support.pri -+++ b/src/buildtools/config/support.pri -@@ -89,11 +89,6 @@ defineTest(qtwebengine_checkErrorForLinux) { - return(false) - } - -- !qtConfig(webengine-system-glibc) { -- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") -- return(false) -- } -- - !qtConfig(webengine-system-khr) { - qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)") - return(false) diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch new file mode 100644 index 00000000..337c14ac --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch @@ -0,0 +1,24 @@ +From 507d6323fe871cee981155675cb5ef7cbd253db1 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 diff --git a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch new file mode 100644 index 00000000..06c659c9 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch @@ -0,0 +1,26 @@ +From 6d2e83489770c2eae6d15d06ca9c04667140bb84 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Nov 2019 19:53:59 -0800 +Subject: [PATCH] mkspecs: Allow builds with libc != glibc + +Signed-off-by: Khem Raj +--- + src/buildtools/config/support.pri | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index 5bdd808d..19540787 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -89,11 +89,6 @@ defineTest(qtwebengine_checkErrorForLinux) { + return(false) + } + +- !qtConfig(webengine-system-glibc) { +- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") +- return(false) +- } +- + !qtConfig(webengine-system-khr) { + qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)") + return(false) 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 -- cgit v1.2.3-54-g00ecf