Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Oct 2025 19:18:41 GMT
From:      Hiroki Tagato <tagattie@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 38629ff034cd - main - devel/electron34: fix build with rust 1.90
Message-ID:  <202510051918.595JIf8r055501@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=38629ff034cdf99c21c0b255d5863ab721da161a

commit 38629ff034cdf99c21c0b255d5863ab721da161a
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-10-05 19:15:41 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-10-05 19:18:28 +0000

    devel/electron34: fix build with rust 1.90
    
    PR:             290009
    Reported by:    diizzy
    Obtained from:  https://cgit.freebsd.org/ports/commit/?id=a448aeb00153c3465a30ff41ecf43f8896a50d52
---
 devel/electron34/files/patch-build_rust_allocator_lib.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/devel/electron34/files/patch-build_rust_allocator_lib.rs b/devel/electron34/files/patch-build_rust_allocator_lib.rs
index 3e1dd7dcb48b..b0ec74e92ff3 100644
--- a/devel/electron34/files/patch-build_rust_allocator_lib.rs
+++ b/devel/electron34/files/patch-build_rust_allocator_lib.rs
@@ -1,6 +1,6 @@
---- build/rust/allocator/lib.rs.orig	2025-08-26 22:47:37 UTC
+--- build/rust/allocator/lib.rs.orig	2025-10-05 11:01:12 UTC
 +++ build/rust/allocator/lib.rs
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,132 @@
 +// 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.
@@ -102,7 +102,14 @@
 +    #[linkage = "weak"]
 +    static __rust_no_alloc_shim_is_unstable: u8 = 0;
 +
++    #[rustc_std_internal_symbol]
++    #[linkage = "weak"]
++    fn __rust_alloc_error_handler_should_panic_v2() -> u8 {
++        0
++    }
++
 +    // Mangle the symbol name as rustc expects.
++    // TODO(crbug.com/440481922): Remove this after rolling past https://github.com/rust-lang/rust/pull/143387
 +    #[rustc_std_internal_symbol]
 +    #[allow(non_upper_case_globals)]
 +    #[linkage = "weak"]


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510051918.595JIf8r055501>