Skip to content

scarthgap: chromium: Fix build with Rust >= 1.86 #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2025
Merged

scarthgap: chromium: Fix build with Rust >= 1.86 #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ SRC_URI:append:libc-musl = "\
file://musl/0015-fix-libc-version-include.patch \
"

SRC_URI:append = "${@oe.utils.version_less_or_equal('RUSTVERSION', '1.85', '', ' file://0016-Fix-adler-reference-for-Rust-1.86-and-later.patch', d)}"

ANY_OF_DISTRO_FEATURES = "opengl vulkan"

# Append instead of assigning; the gtk-icon-cache class inherited above also
Expand Down
28 changes: 28 additions & 0 deletions ...ium/recipes-browser/chromium/files/0016-Fix-adler-reference-for-Rust-1.86-and-later.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 416c6c72c9be8092911b68d0edc2f96a1b0ad349 Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@ew.tq-group.com>
Date: Wed, 3 Sep 2025 11:26:19 +0200
Subject: [PATCH 1/1] Fix adler reference for Rust 1.86 and later

Since version 1.86.0 Rust ships adler2. Adjust the reference.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
build/rust/std/BUILD.gn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
index 38e5ab76457dd..ca5d97ea7ef81 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -74,7 +74,7 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
- "adler",
+ "adler2",
"gimli",
"libc",
"memchr",
--
2.43.0