From 1b7fd40fb3b73f355631b1d816fb8f2c3371395c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 29 Jan 2023 22:47:03 -0800 Subject: perfetto: Fix build with gcc13 Signed-off-by: Khem Raj --- ...missing-header-cstdint-for-uintXX_t-types.patch | 58 ++++++++++++++++++++++ meta-oe/recipes-devtools/perfetto/perfetto.bb | 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..d08721ae65 --- /dev/null +++ b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,58 @@ +From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 29 Jan 2023 22:03:01 -0800 +Subject: [PATCH] Add missing header for uintXX_t types + +This is detected by gcc-13 +gcc 13 moved some includes around and as a result is no +longer transitively included [1]. Explicitly include it for uintXX_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128] +Signed-off-by: Khem Raj +--- + include/perfetto/ext/base/http/sha1.h | 1 + + include/perfetto/ext/base/uuid.h | 1 + + src/traced/probes/common/cpu_freq_info.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h +index c583d69d4..7e3a48c83 100644 +--- a/include/perfetto/ext/base/http/sha1.h ++++ b/include/perfetto/ext/base/http/sha1.h +@@ -20,6 +20,7 @@ + #include + + #include ++#include + #include + + namespace perfetto { +diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h +index 1b4c53815..472042fab 100644 +--- a/include/perfetto/ext/base/uuid.h ++++ b/include/perfetto/ext/base/uuid.h +@@ -18,6 +18,7 @@ + #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ + + #include ++#include + #include + + #include "perfetto/ext/base/optional.h" +diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h +index 36f7f9c09..8232cbf64 100644 +--- a/src/traced/probes/common/cpu_freq_info.h ++++ b/src/traced/probes/common/cpu_freq_info.h +@@ -17,6 +17,7 @@ + #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ + #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ + ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb index 1605de489f..3cc732b700 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb @@ -17,7 +17,8 @@ SRC_URI:append = " \ git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \ git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \ https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \ - file://0001-Remove-check_build_deps-build-steps.patch " + file://0001-Remove-check_build_deps-build-steps.patch \ + file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch" SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3" SRCREV_libcxx = "d9040c75cfea5928c804ab7c235fed06a63f743a" -- cgit 1.2.3-korg