From fa9c4ff42c2adf61614b54561f37983637864954 Mon Sep 17 00:00:00 2001 From: Max Ihlenfeldt Date: Tue, 22 Aug 2023 09:19:12 +0000 Subject: [PATCH 1/2] chromium: Disable Rust for now It turns out that Rust might be used in the build in 114 already. As discussed in #723, we need to figure out how to best support Rust builds, and until we've done so we need to disable it. --- meta-chromium/recipes-browser/chromium/chromium-gn.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index b893d67e..60e11126 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -303,6 +303,9 @@ GN_ARGS += ' \ # but we can use whatever user configured in PARALLEL_MAKE GN_ARGS += 'max_jobs_per_link="${@oe.utils.parallel_make_argument(d, '%d')}"' +# We haven't figured out how to best support Rust yet, so disable it for now. +GN_ARGS += 'enable_rust=false' + # ARM builds need special additional flags (see ${S}/build/config/arm.gni). # If we do not pass |arm_arch| and friends to GN, it will deduce a value that # will then conflict with TUNE_CCARGS and CC. From 7fcf0d4d01ff95bd1fca7fd0053ff2b6d5b3d7c2 Mon Sep 17 00:00:00 2001 From: Max Ihlenfeldt Date: Tue, 22 Aug 2023 10:22:47 +0000 Subject: [PATCH 2/2] mention issue in chromium-gn.inc comment --- meta-chromium/recipes-browser/chromium/chromium-gn.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index 60e11126..17741d91 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -304,6 +304,7 @@ GN_ARGS += ' \ GN_ARGS += 'max_jobs_per_link="${@oe.utils.parallel_make_argument(d, '%d')}"' # We haven't figured out how to best support Rust yet, so disable it for now. +# See the discussion at https://github.com/OSSystems/meta-browser/issues/723. GN_ARGS += 'enable_rust=false' # ARM builds need special additional flags (see ${S}/build/config/arm.gni).