diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-04-29 13:36:15 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-05-10 12:48:53 +0200 |
commit | 6a37d8646d65ab225bfd4a9e6e4646556fa98f44 (patch) | |
tree | 5288f5a36371123b0ba3d6755ad4c426f7c921ad /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch | |
parent | ad1d10ae5898ff761334754cb4266dde9ec9a5a7 (diff) | |
download | meta-qt5-upstream/jansa/chromium-87.tar.gz |
qtwebengine: few more fixes for gcc-11upstream/jansa/chromium-87
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch new file mode 100644 index 00000000..27b3d7d2 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch | |||
@@ -0,0 +1,84 @@ | |||
1 | From c6ff2c26ae6a1c7cde6685a697d8dafc6e2d2694 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, mojo, 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 | * mojo: | ||
22 | | FAILED: obj/mojo/public/cpp/platform/platform/named_platform_channel_posix.o | ||
23 | | /OE/build/oe-core/tmp-musl/work/core2-64-oe-linux-musl/qtwebengine/5.15.4+gitAUTOINC+be49f438d6_6c7b4ffb3f-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux-musl/x86_64-oe-linux-musl-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 --sysroot=/OE/build/oe-core/tmp-musl/work/core2-64-oe-linux-musl/qtwebengine/5.15.4+gitAUTOINC+be49f438d6_6c7b4ffb3f-r0/recipe-sysroot -MMD -MF obj/mojo/public/cpp/platform/platform/named_platform_channel_posix.o.d -DIS_MOJO_CPP_PLATFORM_IMPL -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 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -I../../../../git/src/3rdparty/chromium/third_party/boringssl/src/include -I../../../../git/src/3rdparty/chromium/third_party/protobuf/src -Igen/protoc_out -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -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 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -c ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc -o obj/mojo/public/cpp/platform/platform/named_platform_channel_posix.o | ||
24 | | ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc: In function 'bool mojo::{anonymous}::MakeUnixAddr(const ServerName&, sockaddr_un*, size_t*)': | ||
25 | | ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc:53:3: error: 'strncpy' was not declared in this scope | ||
26 | | 53 | strncpy(unix_addr->sun_path, server_name.c_str(), kMaxSocketNameLength); | ||
27 | | | ^~~~~~~ | ||
28 | | ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc:18:1: note: 'strncpy' is defined in header '<cstring>'; did you forget to '#include <cstring>'? | ||
29 | | 17 | #include "base/strings/string_number_conversions.h" | ||
30 | | +++ |+#include <cstring> | ||
31 | | 18 | | ||
32 | |||
33 | * and perfetto: | ||
34 | ../../../../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' | ||
35 | PERFETTO_DCHECK(value < std::numeric_limits<uint32_t>::max()); | ||
36 | |||
37 | This is because its missing right header which perhaps is included | ||
38 | implicitly in older compilers | ||
39 | |||
40 | Upstream-Status: Pending | ||
41 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
42 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
43 | --- | ||
44 | .../mojo/public/cpp/platform/named_platform_channel_posix.cc | 1 + | ||
45 | .../abseil-cpp/absl/synchronization/internal/graphcycles.cc | 1 + | ||
46 | .../perfetto/src/trace_processor/containers/string_pool.h | 1 + | ||
47 | 3 files changed, 3 insertions(+) | ||
48 | |||
49 | diff --git a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc | ||
50 | index 9082ac4da59..d039ff83a35 100644 | ||
51 | --- a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc | ||
52 | +++ b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc | ||
53 | @@ -8,6 +8,7 @@ | ||
54 | #include <sys/socket.h> | ||
55 | #include <sys/un.h> | ||
56 | #include <unistd.h> | ||
57 | +#include <string.h> | ||
58 | |||
59 | #include "base/files/file_util.h" | ||
60 | #include "base/files/scoped_file.h" | ||
61 | diff --git a/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | ||
62 | index 19f9aab5b1a..ab9d7f80bc7 100644 | ||
63 | --- a/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | ||
64 | +++ b/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | ||
65 | @@ -36,6 +36,7 @@ | ||
66 | #include "absl/synchronization/internal/graphcycles.h" | ||
67 | |||
68 | #include <algorithm> | ||
69 | +#include <limits> | ||
70 | #include <array> | ||
71 | #include "absl/base/internal/hide_ptr.h" | ||
72 | #include "absl/base/internal/raw_logging.h" | ||
73 | 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 | ||
74 | index 11ae91cfeca..558ff00e8fe 100644 | ||
75 | --- a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h | ||
76 | +++ b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h | ||
77 | @@ -20,6 +20,7 @@ | ||
78 | #include <stddef.h> | ||
79 | #include <stdint.h> | ||
80 | |||
81 | +#include <limits> | ||
82 | #include <unordered_map> | ||
83 | #include <vector> | ||
84 | |||