From nobody Tue Aug 26 21:56:17 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBM1Y507Nz66BM3; Tue, 26 Aug 2025 21:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBM1Y2fVWz3NP6; Tue, 26 Aug 2025 21:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756245377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8f84/BSCbP96iW70NHd98SAR+tEZOQ9sSUWolaEwfkM=; b=Ea2Jp9aA5WXv+DZN3MCgpypBlxZQ9LGSWwG0gtMPFEJIwnsWh46o8scwieAEqZqxA2QyS/ gf0X++B62a8qyb7wqqq3C/RoIjUlPgq8N+Tyak4byoBuhR318TysJR9oMubMzVJFuMnV38 WjmqTtjc09cuJjOxJa/41soecENpA8HQVE7M/p6RnAOKmtJ2TWC1xJ3+N2k4oHOhUDBAb2 PhoI4Ui+nXtGOCzbmGSSZhUMOkJY9QzoMb9fP/YjuftTbpIo8LzvwYBOPjpmzfpFZ758u4 OaVAtKvI7gNSU9dlOtvLNXk9/qOaYeMioFIfqn1eKQyL5hgSGO+cqFaeKVogyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756245377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8f84/BSCbP96iW70NHd98SAR+tEZOQ9sSUWolaEwfkM=; b=JWqlZZI2lkp/MnBHbbKFTpj9B4GA9AWJjXgiF5xjAQTrlizrE94cQAJeZP8RTjbIbB1pVU sjFyckwWs0hMHEo+9WnhxvbhqOMYHDVhjX90K5jtJBVWoc5MEtPtz7kKubsp63ZBVyN78c mYyvP23KhV4h3/4HmAx3ML6bAT6XjZ493X1upfFK7vvaQTn11fAcE3mfBqBdJrBALuFKDt P1MLBqg3XiOfKhfRCjPce/o9VHYZg0QcfPE/l1XFeA/5C/HtmGsBvVFcou1LIeYxHwNShc Ecu01krQTrI0gUp8AuzeODQwMtjHC4FUWtNglRT0DElo1lZcpX7qlolBJEEEsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756245377; a=rsa-sha256; cv=none; b=U6P329deacJwYiU04c8sFHg1PhMP/9dL7fLsQOf/gn/FyKmQUk2YZvmXSk/Xgl2KEQKoDj DumNFUW2Q/87DuvcQmFBRVz6VOPopAA3yZsP3vWolCZ0/x6HkWcBU6+bz4hzPZ5N6ChFf8 u9TiMlJMTQeYRGMnWfYGlMCG0hN0dKuhCbhe/e1Xw9/KQJmTKhET7taQwDbjJTzqn+mgeS 6qDUc9px9mq8sFmnzC4ZTQwpWBJRax6VMZaIR2RkIaSSaP//e7W3BytI9Lm+4FImiEJhe3 PVQKkl/8rF+evk0KIxZ+dmPcr0ix5mgFCCMcFuZLU4kq0Aefr1gSMKEnmDqhLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBM1Y1zbvzv6f; Tue, 26 Aug 2025 21:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57QLuHVv007029; Tue, 26 Aug 2025 21:56:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QLuHaG007026; Tue, 26 Aug 2025 21:56:17 GMT (envelope-from git) Date: Tue, 26 Aug 2025 21:56:17 GMT Message-Id: <202508262156.57QLuHaG007026@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: efd72d5cf05f - main - devel/electron37: adjust patch to unbreak build with rust 1.88 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efd72d5cf05fb4097918e060209908e63ea70301 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=efd72d5cf05fb4097918e060209908e63ea70301 commit efd72d5cf05fb4097918e060209908e63ea70301 Author: Hiroki Tagato AuthorDate: 2025-08-26 21:55:00 +0000 Commit: Hiroki Tagato CommitDate: 2025-08-26 21:56:05 +0000 devel/electron37: 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: bf9da96ad4c8 (devel/electron37: fix build with rust 1.89.0) --- devel/electron37/files/patch-build_rust_allocator_lib.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/devel/electron37/files/patch-build_rust_allocator_lib.rs b/devel/electron37/files/patch-build_rust_allocator_lib.rs index 3ee49686575f..c7a59f7ef428 100644 --- a/devel/electron37/files/patch-build_rust_allocator_lib.rs +++ b/devel/electron37/files/patch-build_rust_allocator_lib.rs @@ -1,14 +1,15 @@ --- build/rust/allocator/lib.rs.orig 2025-08-11 20:33:34 UTC +++ build/rust/allocator/lib.rs -@@ -86,9 +86,8 @@ mod both_allocators { +@@ -86,6 +86,12 @@ mod both_allocators { /// 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] ++ #[linkage = "weak"] + fn __rust_no_alloc_shim_is_unstable_v2() {} - - // Mangle the symbol name as rustc expects. - #[rustc_std_internal_symbol] ++ ++ // 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;