Date: Tue, 25 Nov 2025 13:39:58 +0000
From: Robert Nagy <rnagy@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject: git: f622129068b7 - 2025Q4 - www/{*chromium,iridium}: unbreak with rust 1.89
Message-ID: <6925b1ae.2aab0.52caea86@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q4 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f622129068b76b79fdb114f98fdbb20700a44780 commit f622129068b76b79fdb114f98fdbb20700a44780 Author: Robert Nagy <rnagy@FreeBSD.org> AuthorDate: 2025-11-25 13:38:29 +0000 Commit: Robert Nagy <rnagy@FreeBSD.org> CommitDate: 2025-11-25 13:39:42 +0000 www/{*chromium,iridium}: unbreak with rust 1.89 PR: 291107 (cherry picked from commit 31d22775f7f2f7db043c35fe79b9270e4afc53e0) --- www/chromium/files/patch-build_rust_allocator_lib.rs | 10 ++++++++-- www/iridium/files/patch-build_rust_allocator_lib.rs | 10 ++++++++-- www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/www/chromium/files/patch-build_rust_allocator_lib.rs b/www/chromium/files/patch-build_rust_allocator_lib.rs index 13477ad454be..5683fb4c4512 100644 --- a/www/chromium/files/patch-build_rust_allocator_lib.rs +++ b/www/chromium/files/patch-build_rust_allocator_lib.rs @@ -1,6 +1,6 @@ ---- build/rust/allocator/lib.rs.orig 2025-10-30 15:44:36 UTC +--- build/rust/allocator/lib.rs.orig 2025-11-25 13:37:36 UTC +++ build/rust/allocator/lib.rs -@@ -96,6 +96,12 @@ mod both_allocators { +@@ -96,6 +96,18 @@ mod both_allocators { 0 } @@ -9,6 +9,12 @@ + #[no_mangle] + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; ++ ++ // 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"] ++ static __rust_alloc_error_handler_should_panic: u8 = 0; + // Mangle the symbol name as rustc expects. #[rustc_std_internal_symbol] diff --git a/www/iridium/files/patch-build_rust_allocator_lib.rs b/www/iridium/files/patch-build_rust_allocator_lib.rs index e4351db6f315..5683fb4c4512 100644 --- a/www/iridium/files/patch-build_rust_allocator_lib.rs +++ b/www/iridium/files/patch-build_rust_allocator_lib.rs @@ -1,6 +1,6 @@ ---- build/rust/allocator/lib.rs.orig 2025-11-06 10:11:34 UTC +--- build/rust/allocator/lib.rs.orig 2025-11-25 13:37:36 UTC +++ build/rust/allocator/lib.rs -@@ -96,6 +96,12 @@ mod both_allocators { +@@ -96,6 +96,18 @@ mod both_allocators { 0 } @@ -9,6 +9,12 @@ + #[no_mangle] + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; ++ ++ // 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"] ++ static __rust_alloc_error_handler_should_panic: u8 = 0; + // Mangle the symbol name as rustc expects. #[rustc_std_internal_symbol] diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs index c0725520554d..5683fb4c4512 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs +++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs @@ -1,6 +1,6 @@ ---- build/rust/allocator/lib.rs.orig 2025-11-01 06:40:37 UTC +--- build/rust/allocator/lib.rs.orig 2025-11-25 13:37:36 UTC +++ build/rust/allocator/lib.rs -@@ -96,6 +96,12 @@ mod both_allocators { +@@ -96,6 +96,18 @@ mod both_allocators { 0 } @@ -9,6 +9,12 @@ + #[no_mangle] + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; ++ ++ // 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"] ++ static __rust_alloc_error_handler_should_panic: u8 = 0; + // Mangle the symbol name as rustc expects. #[rustc_std_internal_symbol]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6925b1ae.2aab0.52caea86>