From a73de388e628a67490cdd7734779d405740b7fa3 Mon Sep 17 00:00:00 2001 From: Jani Suonpera Date: Wed, 27 Jan 2021 09:21:29 +0200 Subject: qt5: update submodules for LTS 5.15 - Webengine-chromium branch changed from 83-based to 87-based. - PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations has been removed from src/buildtools/configure.json - DEPENDS nodejs-native added. This mandatory for chromium build. Task-number: QTBUG-90623 Change-Id: Ic933c88399422941114915afe5baa202850928f4 Reviewed-by: Samuli Piippo --- ...10-chromium-Link-v8-with-libatomic-on-x86.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch (limited to 'recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch new file mode 100644 index 00000000..c63047b8 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch @@ -0,0 +1,29 @@ +From 79aff9ed2ef07c562ba6dcbdd7e0274eebd3dc29 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 1 Feb 2020 12:17:23 -0800 +Subject: [PATCH] chromium: Link v8 with libatomic on x86 + +Fixes +| v8_base_without_compiler_jumbo_47.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x29a): undefined reference to `__atomic_l +oad' + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + chromium/v8/BUILD.gn | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn +index ba99c75140b..33cf943bcba 100644 +--- a/chromium/v8/BUILD.gn ++++ b/chromium/v8/BUILD.gn +@@ -3862,7 +3862,8 @@ v8_source_set("v8_base_without_compiler") { + if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || + v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || + v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || +- v8_current_cpu == "s390" || v8_current_cpu == "s390x") { ++ v8_current_cpu == "s390" || v8_current_cpu == "s390x" || ++ v8_current_cpu == "x86") { + libs += [ "atomic" ] + } + -- cgit v1.2.3-54-g00ecf