git: 9fd2ef661fea - main - devel/electron36: fix build with rust 1.89.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Aug 2025 07:24:50 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9fd2ef661feabbca8d1b801a0caee92b4d4b815b
commit 9fd2ef661feabbca8d1b801a0caee92b4d4b815b
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2025-08-26 07:20:56 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-08-26 07:24:32 +0000
devel/electron36: fix build with rust 1.89.0
Obtained from: https://chromium.googlesource.com/chromium/src/+/8393b61ba876c8e1614275c97767f9b06b889f48%5E%21/#F0,
https://chromium.googlesource.com/chromium/src/+/6aae0e2353c857d98980ff677bf304288d7c58de%5E%21/#F0
Pull Request: https://github.com/tagattie/FreeBSD-Electron/pull/165
---
devel/electron36/files/patch-build_rust_allocator_lib.rs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/devel/electron36/files/patch-build_rust_allocator_lib.rs b/devel/electron36/files/patch-build_rust_allocator_lib.rs
index 89fddf278294..b89d8cc88a2b 100644
--- a/devel/electron36/files/patch-build_rust_allocator_lib.rs
+++ b/devel/electron36/files/patch-build_rust_allocator_lib.rs
@@ -1,6 +1,6 @@
---- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
+--- build/rust/allocator/lib.rs.orig 2025-08-26 06:51:00 UTC
+++ build/rust/allocator/lib.rs
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,118 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -92,9 +92,8 @@
+ /// As part of rustc's contract for using `#[global_allocator]` without
+ /// rustc-generated shims we must define this symbol, since we are opting in
+ /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
-+ #[no_mangle]
-+ #[linkage = "weak"]
-+ static __rust_no_alloc_shim_is_unstable: u8 = 0;
++ #[rustc_std_internal_symbol]
++ fn __rust_no_alloc_shim_is_unstable_v2() {}
+
+ // Mangle the symbol name as rustc expects.
+ #[rustc_std_internal_symbol]