git: 3a88abf6a269 - main - devel/electron34: Fix build with rust 1.86.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Apr 2025 08:41:29 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3a88abf6a2695a883f8059ef78ee2e97c90e8333
commit 3a88abf6a2695a883f8059ef78ee2e97c90e8333
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2025-04-08 08:20:40 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2025-04-08 08:41:11 +0000
devel/electron34: Fix build with rust 1.86.0
PR: 285840
Approved by: portmgr (build fix blanket)
---
.../electron34/files/patch-build_rust_std_BUILD.gn | 26 ++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/devel/electron34/files/patch-build_rust_std_BUILD.gn b/devel/electron34/files/patch-build_rust_std_BUILD.gn
index f40de14fbd97..473f4c097e4b 100644
--- a/devel/electron34/files/patch-build_rust_std_BUILD.gn
+++ b/devel/electron34/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,28 @@
---- build/rust/std/BUILD.gn.orig 2024-08-14 20:54:23 UTC
+--- build/rust/std/BUILD.gn.orig 2025-04-05 13:54:50 UTC
+++ build/rust/std/BUILD.gn
-@@ -100,7 +100,6 @@ if (toolchain_has_rust) {
+@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
+ # These are no longer present in the Windows toolchain.
+ stdlib_files += [
+ "addr2line",
+- "adler",
+ "gimli",
+ "libc",
+ "memchr",
+ "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 = [