diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-04-29 11:18:10 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-05-10 12:48:49 +0200 |
commit | 6a0cbc0b063cfcf807b25129b9c23280a15ca74e (patch) | |
tree | 8bdfc808dd4aa2bc243b2ffbf384bc017296b456 /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-perfetto-fix-build-with-gcc-11.patch | |
parent | fab0e0522c52bc944bc7f8b6e4947f63243039cd (diff) | |
download | meta-qt5-6a0cbc0b063cfcf807b25129b9c23280a15ca74e.tar.gz |
qtwebengine: upgrade to latest 5.15 and 87-based, fix build with gcc-11
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-perfetto-fix-build-with-gcc-11.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-perfetto-fix-build-with-gcc-11.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-perfetto-fix-build-with-gcc-11.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-perfetto-fix-build-with-gcc-11.patch new file mode 100644 index 00000000..9388c767 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-perfetto-fix-build-with-gcc-11.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 504691a6e2ab928115cde1f6163661158151636b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 29 Apr 2021 11:11:51 +0200 | ||
4 | Subject: [PATCH] chromium: abseil-cpp, perfetto: fix build with gcc-11 | ||
5 | |||
6 | * fixes abseil-cpp: | ||
7 | FAILED: obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o | ||
8 | /OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.3+gitAUTOINC+0930b350d7_687d322fae-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.3+gitAUTOINC+0930b350d7_687d322fae-r0/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc -o obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o | ||
9 | ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc: In member function 'void absl::synchronization_internal::GraphCycles::RemoveNode(void*)': | ||
10 | ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:26: error: 'numeric_limits' is not a member of 'std' | ||
11 | 451 | if (x->version == std::numeric_limits<uint32_t>::max()) { | ||
12 | | ^~~~~~~~~~~~~~ | ||
13 | ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:49: error: expected primary-expression before '>' token | ||
14 | 451 | if (x->version == std::numeric_limits<uint32_t>::max()) { | ||
15 | | ^ | ||
16 | ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:52: error: '::max' has not been declared; did you mean 'std::max'? | ||
17 | 451 | if (x->version == std::numeric_limits<uint32_t>::max()) { | ||
18 | | ^~~ | ||
19 | | std::max | ||
20 | |||
21 | * and perfetto: | ||
22 | ../../../../git/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h:256:34: error: no member named 'numeric_limits' in namespace 'std' | ||
23 | PERFETTO_DCHECK(value < std::numeric_limits<uint32_t>::max()); | ||
24 | |||
25 | This is because its missing right header which perhaps is included | ||
26 | implicitly in older compilers | ||
27 | |||
28 | Upstream-Status: Pending | ||
29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
30 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
31 | --- | ||
32 | .../abseil-cpp/absl/synchronization/internal/graphcycles.cc | 1 + | ||
33 | .../perfetto/src/trace_processor/containers/string_pool.h | 1 + | ||
34 | 2 files changed, 2 insertions(+) | ||
35 | |||
36 | diff --git a/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | ||
37 | index 19f9aab5b1a..ab9d7f80bc7 100644 | ||
38 | --- a/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | ||
39 | +++ b/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | ||
40 | @@ -36,6 +36,7 @@ | ||
41 | #include "absl/synchronization/internal/graphcycles.h" | ||
42 | |||
43 | #include <algorithm> | ||
44 | +#include <limits> | ||
45 | #include <array> | ||
46 | #include "absl/base/internal/hide_ptr.h" | ||
47 | #include "absl/base/internal/raw_logging.h" | ||
48 | diff --git a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h | ||
49 | index 11ae91cfeca..558ff00e8fe 100644 | ||
50 | --- a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h | ||
51 | +++ b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h | ||
52 | @@ -20,6 +20,7 @@ | ||
53 | #include <stddef.h> | ||
54 | #include <stdint.h> | ||
55 | |||
56 | +#include <limits> | ||
57 | #include <unordered_map> | ||
58 | #include <vector> | ||
59 | |||