Skip to content

Commit 1240b0a

Browse files
authored
scarthgap: chromium: Fix build with Rust >= 1.86 (#922)
Rust 1.86 ships adler2, so the library name has to be adjusted accordingly. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
1 parent 2dabbb1 commit 1240b0a

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ SRC_URI:append:libc-musl = "\
5353
file://musl/0015-fix-libc-version-include.patch \
5454
"
5555

56+
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)}"
57+
5658
ANY_OF_DISTRO_FEATURES = "opengl vulkan"
5759

5860
# Append instead of assigning; the gtk-icon-cache class inherited above also
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 416c6c72c9be8092911b68d0edc2f96a1b0ad349 Mon Sep 17 00:00:00 2001
2+
From: Alexander Stein <alexander.stein@ew.tq-group.com>
3+
Date: Wed, 3 Sep 2025 11:26:19 +0200
4+
Subject: [PATCH 1/1] Fix adler reference for Rust 1.86 and later
5+
6+
Since version 1.86.0 Rust ships adler2. Adjust the reference.
7+
8+
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
9+
---
10+
build/rust/std/BUILD.gn | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
14+
index 38e5ab76457dd..ca5d97ea7ef81 100644
15+
--- a/build/rust/std/BUILD.gn
16+
+++ b/build/rust/std/BUILD.gn
17+
@@ -74,7 +74,7 @@ if (toolchain_has_rust) {
18+
# These are no longer present in the Windows toolchain.
19+
stdlib_files += [
20+
"addr2line",
21+
- "adler",
22+
+ "adler2",
23+
"gimli",
24+
"libc",
25+
"memchr",
26+
--
27+
2.43.0
28+

0 commit comments

Comments
 (0)