git: ae920adf383d - main - devel/electron36: adjust patch to unbreak build with rust 1.88
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Aug 2025 21:56:16 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ae920adf383dcfd0dc48a3201a56fdbf8917c27e
commit ae920adf383dcfd0dc48a3201a56fdbf8917c27e
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-08-26 21:53:23 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-08-26 21:56:05 +0000
devel/electron36: adjust patch to unbreak build with rust 1.88
Removing __rust_no_alloc_shim_is_unstable was too early. It is still
required for build to succeed with rust 1.88. So add it back.
Fixes: 9fd2ef661fea (devel/electron36: fix build with rust 1.89.0)
---
devel/electron36/files/patch-build_rust_allocator_lib.rs | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/devel/electron36/files/patch-build_rust_allocator_lib.rs b/devel/electron36/files/patch-build_rust_allocator_lib.rs
index b89d8cc88a2b..e6dbd2f7e553 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-08-26 06:51:00 UTC
+--- build/rust/allocator/lib.rs.orig 2025-08-26 21:39:41 UTC
+++ build/rust/allocator/lib.rs
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,125 @@
+// 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.
@@ -93,8 +93,15 @@
+ /// 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
+ #[rustc_std_internal_symbol]
++ #[linkage = "weak"]
+ fn __rust_no_alloc_shim_is_unstable_v2() {}
+
++ // TODO(crbug.com/422538133) Remove after rolling past
++ // https://github.com/rust-lang/rust/pull/141061
++ #[no_mangle]
++ #[linkage = "weak"]
++ static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
+ // Mangle the symbol name as rustc expects.
+ #[rustc_std_internal_symbol]
+ #[allow(non_upper_case_globals)]