www/ungoogled-chromium: Fix build with rust 1.86.0

PR: 285840 Approved by: portmgr (build fix blanket)
2025-04-08 10:22:13 +02:00
parent 2a3e58f531
commit 9db632065e
1 changed files with 17 additions and 4 deletions
@@ -1,15 +1,28 @@
--- build/rust/std/BUILD.gn.orig	2025-03-09 21:38:10 UTC
+--- build/rust/std/BUILD.gn.orig	2025-04-05 13:54:50 UTC
 +++ build/rust/std/BUILD.gn
-@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
+@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
     # These are no longer present in the Windows toolchain.
     stdlib_files += [
       "addr2line",
 -      "adler2",
-+      "adler",
       "gimli",
       "libc",
       "memchr",
-@@ -115,7 +115,6 @@ if (toolchain_has_rust) {
+       "miniz_oxide",
+       "object",
+     ]
+
+    rust_revision_pieces = string_split(rustc_revision, " ")
+    rust_version_pieces = string_split(rust_revision_pieces[1], ".")
+    if (rust_version_pieces[1] == "85") {
+      stdlib_files += [ "adler" ]
+    } else {
+      stdlib_files += [ "adler2" ]
+    }
+   }
+ 
+   if (toolchain_for_rust_host_build_tools) {
+@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
   # don't need to pass to the C++ linker because they're used for specialized
   # purposes.
   skip_stdlib_files = [