diff options
Diffstat (limited to 'meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch')
-rw-r--r-- | meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch | 73 |
1 files changed, 0 insertions, 73 deletions
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 @@ | |||
1 | From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sui Chen <suichen6@gmail.com> | ||
3 | Date: Mon, 13 Jun 2022 17:46:49 +0000 | ||
4 | Subject: [PATCH] Remove "check_build_deps" build steps | ||
5 | |||
6 | When building with Bitbake, we want Bitbake to manage our dependencies, | ||
7 | so we remove the "check_build_deps" steps from Perfetto. | ||
8 | |||
9 | Also setting "is_cross_compiling" to true, so that the host-side tools | ||
10 | (such as protoc) will always be generated using the native toolchain, | ||
11 | rather than the Bitbake-generated one. | ||
12 | |||
13 | Signed-off-by: Sui Chen <suichen6@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Pending | ||
16 | |||
17 | gn/BUILD.gn | 1 - | ||
18 | gn/standalone/BUILD.gn | 12 ++++++------ | ||
19 | gn/standalone/BUILDCONFIG.gn | 5 +++-- | ||
20 | 3 files changed, 9 insertions(+), 9 deletions(-) | ||
21 | |||
22 | diff --git a/gn/BUILD.gn b/gn/BUILD.gn | ||
23 | index 8a7ca72a8..e4a2d39f0 100644 | ||
24 | --- a/gn/BUILD.gn | ||
25 | +++ b/gn/BUILD.gn | ||
26 | @@ -111,7 +111,6 @@ group("default_deps") { | ||
27 | deps = [ ":gen_buildflags" ] | ||
28 | if (perfetto_build_standalone) { | ||
29 | public_deps = [ | ||
30 | - "//gn/standalone:check_build_deps", | ||
31 | "//gn/standalone/libc++:deps", | ||
32 | "//gn/standalone/sanitizers:deps", | ||
33 | ] | ||
34 | diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn | ||
35 | index 582e9b867..9c77ac64c 100644 | ||
36 | --- a/gn/standalone/BUILD.gn | ||
37 | +++ b/gn/standalone/BUILD.gn | ||
38 | @@ -441,10 +441,10 @@ config("android_liblog") { | ||
39 | } | ||
40 | |||
41 | # Checks that tools/install-build-deps has been run since it last changed. | ||
42 | -perfetto_check_build_deps("check_build_deps") { | ||
43 | - args = [] | ||
44 | -} | ||
45 | +#perfetto_check_build_deps("check_build_deps") { | ||
46 | +# args = [] | ||
47 | +#} | ||
48 | |||
49 | -perfetto_check_build_deps("check_build_deps_android") { | ||
50 | - args = [ "--android" ] | ||
51 | -} | ||
52 | +#perfetto_check_build_deps("check_build_deps_android") { | ||
53 | +# args = [ "--android" ] | ||
54 | +#} | ||
55 | diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn | ||
56 | index 6f32686c1..c041989b0 100644 | ||
57 | --- a/gn/standalone/BUILDCONFIG.gn | ||
58 | +++ b/gn/standalone/BUILDCONFIG.gn | ||
59 | @@ -59,8 +59,9 @@ declare_args() { | ||
60 | # the ossfuzz sanitizer overrides this to true. In that config the | ||
61 | # host/target cpu and arch are identical, but we want to build only the | ||
62 | # targets with the sanitizer/fuzzer flags | ||
63 | - is_cross_compiling = | ||
64 | - target_cpu != host_cpu || target_os != host_os || target_triplet != "" | ||
65 | + | ||
66 | + # for Bitbake build | ||
67 | + is_cross_compiling = true | ||
68 | } | ||
69 | default_configs = [ | ||
70 | "//gn/standalone:debug_symbols", | ||
71 | -- | ||
72 | 2.37.1 | ||
73 | |||