4 files changed, 40 insertions, 180 deletions

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
deleted file mode 100644
index d08721ae65..0000000000
--- a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 29 Jan 2023 22:03:01 -0800
-Subject: [PATCH] Add missing header <cstdint> for uintXX_t types
-
-This is detected by gcc-13
-gcc 13 moved some includes around and as a result <cstdint> 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 <raj.khem@gmail.com>
----
- 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 <stddef.h>
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- 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 <array>
-+#include <cstdint>
- #include <string>
- 
- #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 <cstdint>
- #include <map>
- #include <string>
- #include <vector>
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch
deleted file mode 100644
index c10400aef4..0000000000
--- a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001
-From: Sui Chen <suichen6@gmail.com>
-Date: Mon, 13 Jun 2022 17:46:49 +0000
-Subject: [PATCH] Remove "check_build_deps" build steps
-
-When building with Bitbake, we want Bitbake to manage our dependencies,
-so we remove the "check_build_deps" steps from Perfetto.
-
-Also setting "is_cross_compiling" to true, so that the host-side tools
-(such as protoc) will always be generated using the native toolchain,
-rather than the Bitbake-generated one.
-
-Signed-off-by: Sui Chen <suichen6@gmail.com>
----
-Upstream-Status: Pending
-
- gn/BUILD.gn                  |  1 -
- gn/standalone/BUILD.gn       | 12 ++++++------
- gn/standalone/BUILDCONFIG.gn |  5 +++--
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/gn/BUILD.gn b/gn/BUILD.gn
-index 8a7ca72a8..e4a2d39f0 100644
---- a/gn/BUILD.gn
-+++ b/gn/BUILD.gn
-@@ -111,7 +111,6 @@ group("default_deps") {
-   deps = [ ":gen_buildflags" ]
-   if (perfetto_build_standalone) {
-     public_deps = [
--      "//gn/standalone:check_build_deps",
-       "//gn/standalone/libc++:deps",
-       "//gn/standalone/sanitizers:deps",
-     ]
-diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn
-index 582e9b867..9c77ac64c 100644
---- a/gn/standalone/BUILD.gn
-+++ b/gn/standalone/BUILD.gn
-@@ -441,10 +441,10 @@ config("android_liblog") {
- }
- 
- # Checks that tools/install-build-deps has been run since it last changed.
--perfetto_check_build_deps("check_build_deps") {
--  args = []
--}
-+#perfetto_check_build_deps("check_build_deps") {
-+#  args = []
-+#}
- 
--perfetto_check_build_deps("check_build_deps_android") {
--  args = [ "--android" ]
--}
-+#perfetto_check_build_deps("check_build_deps_android") {
-+#  args = [ "--android" ]
-+#}
-diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn
-index 6f32686c1..c041989b0 100644
---- a/gn/standalone/BUILDCONFIG.gn
-+++ b/gn/standalone/BUILDCONFIG.gn
-@@ -59,8 +59,9 @@ declare_args() {
-   # the ossfuzz sanitizer overrides this to true. In that config the
-   # host/target cpu and arch are identical, but we want to build only the
-   # targets with the sanitizer/fuzzer flags
--  is_cross_compiling =
--      target_cpu != host_cpu || target_os != host_os || target_triplet != ""
-+
-+  # for Bitbake build
-+  is_cross_compiling = true
- }
- default_configs = [
-   "//gn/standalone:debug_symbols",
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
new file mode 100644
index 0000000000..3b7ca951ae
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
@@ -0,0 +1,40 @@
+From 485c21940eb0100a33b7efea40a83e7f79e765f8 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Sun, 22 Sep 2024 20:17:52 +0200
+Subject: [PATCH] fix musl build
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+Upstream-Status: Pending
+
+ sdk/perfetto.cc   | 1 -
+ src/base/utils.cc | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc
+index b10dd5aa92..2eb90f0d15 100644
+--- a/sdk/perfetto.cc
++++ b/sdk/perfetto.cc
+@@ -6558,7 +6558,6 @@ std::optional<int32_t> GetTimezoneOffsetMins() {
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ 
+ #ifndef PR_GET_TAGGED_ADDR_CTRL
+diff --git a/src/base/utils.cc b/src/base/utils.cc
+index 0d9318c136..419c7dbc1a 100644
+--- a/src/base/utils.cc
++++ b/src/base/utils.cc
+@@ -40,7 +40,6 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ 
+ #ifndef PR_GET_TAGGED_ADDR_CTRL
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch
deleted file mode 100644
index ae644747c1..0000000000
--- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 027f90dc9386ec08f2a5107025683e5fed6f3444 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 17 Oct 2022 19:20:53 +0200
-Subject: [PATCH] meson: add PC file for lib_perfetto
-
----
-Upstream-Status: Pending
-
- meson.build | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
---- a/meson.build
-+++ b/meson.build
-@@ -19,9 +19,12 @@
- project(
-     'perfetto',
-     ['cpp'],
--    default_options: ['cpp_std=c++17']
-+    default_options: ['cpp_std=c++17'],
-+    version: '31.0'
- )
- 
-+soversion = meson.project_version()
-+
- fs = import('fs')
- 
- if not fs.is_dir('sdk')
-@@ -36,8 +39,9 @@ if host_machine.system() == 'android'
-   deps_perfetto += cpp.find_library('log')
- endif
- 
--lib_perfetto = static_library(
-+lib_perfetto = shared_library(
-     'perfetto',
-+    version: soversion,
-     sources: 'sdk/perfetto.cc',
-     dependencies: deps_perfetto,
-     install: true,
-@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu
- 
- install_data(dir_perfetto_trace / 'perfetto_trace.proto')
- 
-+install_headers('sdk/perfetto.h')
-+pkg = import('pkgconfig')
-+pkg.generate(lib_perfetto)
-+
- dep_perfetto = declare_dependency(
-     link_with: lib_perfetto,
-     include_directories: inc_perfetto,