commit: a7be8d0fa25a16b82a75b28a1f63dbb52d455e95 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Tue Mar 3 05:20:17 2026 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Tue Mar 3 07:03:01 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7be8d0f
www-client/chromium: use versioned rustfmt binary Closes: https://bugs.gentoo.org/970825 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/chromium/chromium-145.0.7632.109.ebuild | 8 ++++++-- www-client/chromium/chromium-145.0.7632.116-r1.ebuild | 9 +++++++-- www-client/chromium/chromium-145.0.7632.116.ebuild | 8 ++++++-- www-client/chromium/chromium-146.0.7680.31-r1.ebuild | 9 +++++++-- www-client/chromium/chromium-147.0.7703.0.ebuild | 9 +++++++-- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/www-client/chromium/chromium-145.0.7632.109.ebuild b/www-client/chromium/chromium-145.0.7632.109.ebuild index 7d35738680d3..1b5caba99501 100644 --- a/www-client/chromium/chromium-145.0.7632.109.ebuild +++ b/www-client/chromium/chromium-145.0.7632.109.ebuild @@ -622,8 +622,6 @@ src_prepare() { shopt -u nullglob - remove_compiler_builtins - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together if use ppc64; then local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" @@ -645,6 +643,12 @@ src_prepare() { fi fi + remove_compiler_builtins + + # We can't rely on the eselect'd Rust to actually include bindgen, so we'll point to the selected slot specifically. + sed -i "s|/bin/rustfmt|/bin/rustfmt-${RUST_SLOT}|g" build/rust/rust_bindgen_generator.gni || + die "Failed to update rustfmt path" + fi default diff --git a/www-client/chromium/chromium-145.0.7632.116-r1.ebuild b/www-client/chromium/chromium-145.0.7632.116-r1.ebuild index 4abc58a0fdd2..5fe6694c8e21 100644 --- a/www-client/chromium/chromium-145.0.7632.116-r1.ebuild +++ b/www-client/chromium/chromium-145.0.7632.116-r1.ebuild @@ -568,8 +568,6 @@ src_prepare() { shopt -u nullglob - remove_compiler_builtins - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together if use ppc64; then local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" @@ -590,6 +588,13 @@ src_prepare() { PATCHES+=( "${patchset_dir}/${isa_3_patch}" ) fi fi + + remove_compiler_builtins + + # We can't rely on the eselect'd Rust to actually include bindgen, so we'll point to the selected slot specifically. + sed -i "s|/bin/rustfmt|/bin/rustfmt-${RUST_SLOT}|g" build/rust/rust_bindgen_generator.gni || + die "Failed to update rustfmt path" + fi default diff --git a/www-client/chromium/chromium-145.0.7632.116.ebuild b/www-client/chromium/chromium-145.0.7632.116.ebuild index 015207b21b0b..ea2b84121d53 100644 --- a/www-client/chromium/chromium-145.0.7632.116.ebuild +++ b/www-client/chromium/chromium-145.0.7632.116.ebuild @@ -623,8 +623,6 @@ src_prepare() { shopt -u nullglob - remove_compiler_builtins - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together if use ppc64; then local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" @@ -646,6 +644,12 @@ src_prepare() { fi fi + remove_compiler_builtins + + # We can't rely on the eselect'd Rust to actually include bindgen, so we'll point to the selected slot specifically. + sed -i "s|/bin/rustfmt|/bin/rustfmt-${RUST_SLOT}|g" build/rust/rust_bindgen_generator.gni || + die "Failed to update rustfmt path" + fi default diff --git a/www-client/chromium/chromium-146.0.7680.31-r1.ebuild b/www-client/chromium/chromium-146.0.7680.31-r1.ebuild index 73abc9147bfd..c79fda8c7b10 100644 --- a/www-client/chromium/chromium-146.0.7680.31-r1.ebuild +++ b/www-client/chromium/chromium-146.0.7680.31-r1.ebuild @@ -565,8 +565,6 @@ src_prepare() { shopt -u nullglob - remove_compiler_builtins - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together if use ppc64; then local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" @@ -587,6 +585,13 @@ src_prepare() { PATCHES+=( "${patchset_dir}/${isa_3_patch}" ) fi fi + + remove_compiler_builtins + + # We can't rely on the eselect'd Rust to actually include bindgen, so we'll point to the selected slot specifically. + sed -i "s|/bin/rustfmt|/bin/rustfmt-${RUST_SLOT}|g" build/rust/rust_bindgen_generator.gni || + die "Failed to update rustfmt path" + fi default diff --git a/www-client/chromium/chromium-147.0.7703.0.ebuild b/www-client/chromium/chromium-147.0.7703.0.ebuild index c7a11635b51d..b7a2fe2dd00f 100644 --- a/www-client/chromium/chromium-147.0.7703.0.ebuild +++ b/www-client/chromium/chromium-147.0.7703.0.ebuild @@ -565,8 +565,6 @@ src_prepare() { shopt -u nullglob - remove_compiler_builtins - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together if use ppc64; then local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" @@ -587,6 +585,13 @@ src_prepare() { PATCHES+=( "${patchset_dir}/${isa_3_patch}" ) fi fi + + remove_compiler_builtins + + # We can't rely on the eselect'd Rust to actually include bindgen, so we'll point to the selected slot specifically. + sed -i "s|/bin/rustfmt|/bin/rustfmt-${RUST_SLOT}|g" build/rust/rust_bindgen_generator.gni || + die "Failed to update rustfmt path" + fi default
