From nobody Tue Sep 23 16:20:56 2025 X-Original-To: dev-commits-ports-main@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 4cWQFj0kVXz68qs3; Tue, 23 Sep 2025 16:20:57 +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 4cWQFh6FmBz3y3G; Tue, 23 Sep 2025 16:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758644456; 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=upDTJIKA0U13ss9vmxC42ZmOYJ8+uSoko7gGserjAnA=; b=yOXhGCWqG89j1MezmQKWf1FVfKPfUBIMqumieKc/7Uat5R/J/5pRmV3175wdtPOKra5UCU g7bvSHfZLGVp9kPD6GKZCYWynT6ZQuhn1FZqusfAM3Ca8DVyhjYBRQTxu8pADZti7KnfcR 583QSn8ApztVz8LV61r8Xb2K2Qn38sxM++W/Dwz6ZllnbGLmKCddlfqEr7mwIZsTSMl9nj kYrQi7aIp13Su/4GXaQ0d75mtM2/q3DHo8IIQR7JolH2Wp+lU8NjNpsD6IHRVde/ovRofW otj3YFOR29rzRY8NLHisx0cM5MfnxE9QnBBf6zIH+Ax4DS1uiDVDFyS6ww0Cug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758644456; 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=upDTJIKA0U13ss9vmxC42ZmOYJ8+uSoko7gGserjAnA=; b=wYLe6kTT7lBy32CaHIQqyVzYBczNbUnRGDENA33IlPhztfGKVtb74bDA+BsC60AMMkQ/Cg UXL9eS2Ve/+eOwd1HAV0QQhbGHhCBD2V5S9ZGziQLFgs+BSuus0gCSurNlGSIHRtCwWDDG CNyvAJhWIe40ffrugn/L0AOloE4JKTC+9oxjPPHK8WsPUTDelUad/ivv9r2KOiEcUQeB6Y kxhocqo2QedWqAzaI0FbR6q2ibGPRmsnx0usUSdScpFLYa2ShI6xm/Vc6z14mCctMdNTRL fgbeNJWKS48Kj+URkiWO+jh7Z2MIpr/Eyn1OYtuWsGae2QYiUaVq3Ks56qg1XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758644456; a=rsa-sha256; cv=none; b=Rnccotn4pT5tMjD6vWxJw3CozSE6B5ZKEqZNexYc8e906yUM1nk52eAGFzewqA+IuRfIrh F3hvkL96XdXAl6Rvj0I60zD8c+9VWtq7dzR7ScX7LtSbmbjPMMigi2zNNxtmOMsUOpF+Xq 4mJU8ixZ1CyrVOEs0n0pUDjaRM7wWvV9NW+kAHNY1METEmF8aorQL0Q8vWPIP8cvbtPRKf XjoqlCiOa6xlGYGBJXPeAYA1Xw12iqSrxft7djWf8WEUQsjn/csrd0YMjPulHdrCpLlD72 bfyaSc5z5b1TrVYYz7VgY3M/hKU1d/lGY43AWD4w/nUSppyPIp4d4jyaIQfItw== 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 4cWQFh5rqyztFw; Tue, 23 Sep 2025 16:20:56 +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 58NGKuPJ092065; Tue, 23 Sep 2025 16:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NGKuK2092062; Tue, 23 Sep 2025 16:20:56 GMT (envelope-from git) Date: Tue, 23 Sep 2025 16:20:56 GMT Message-Id: <202509231620.58NGKuK2092062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: de903a74d8d8 - main - =?utf-8?Q?lang/rust-nightly: update 1.91.0.20250907 =E2=86=92 1.92.0.20250921?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de903a74d8d82e15765da10cd00e5b0f81c03ef1 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=de903a74d8d82e15765da10cd00e5b0f81c03ef1 commit de903a74d8d82e15765da10cd00e5b0f81c03ef1 Author: Dmitry Marakasov AuthorDate: 2025-09-11 20:38:50 +0000 Commit: Dmitry Marakasov CommitDate: 2025-09-23 16:20:28 +0000 lang/rust-nightly: update 1.91.0.20250907 → 1.92.0.20250921 Trim patches: - patch-vendor_cc.rs: only patch instances which break the build - patch-src_bootstrap_src_core_sanity.rs: remove as is effectively undoes the side effect of removed parts of the previous patch Approved by: rust (implicit) --- lang/rust-nightly/Makefile | 4 +- lang/rust-nightly/distinfo | 6 +- .../files/patch-src_bootstrap_src_core_sanity.rs | 23 ----- lang/rust-nightly/files/patch-vendor_cc.rs | 106 +-------------------- 4 files changed, 6 insertions(+), 133 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index c00f57552769..0f550f6a9ddd 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,5 +1,5 @@ # Run update.sh to update to the latest nightly -PORTVERSION= 1.91.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.92.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly @@ -14,7 +14,7 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2025-09-07 +NIGHTLY_DATE= 2025-09-21 BOOTSTRAPS_DATE= 2025-08-05 RUST_BOOTSTRAP_VERSION= beta diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index e764885b3c55..323883f67aaf 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1757341820 -SHA256 (rust/2025-09-07/rustc-nightly-src.tar.xz) = b2e82674b09400cce62f8b8b6c16c09dc0cd035f1577dc270bcc713872763943 -SIZE (rust/2025-09-07/rustc-nightly-src.tar.xz) = 284060052 +TIMESTAMP = 1758566024 +SHA256 (rust/2025-09-21/rustc-nightly-src.tar.xz) = cdd35d5d9558222c21c95630af0ab3079471dac68dd2e35166a986ac6c59043b +SIZE (rust/2025-09-21/rustc-nightly-src.tar.xz) = 283457620 SHA256 (rust/2025-08-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = cdfe207645068b4659b0f979cae177723c5f211084f45ae9180b2d93ee83fce6 SIZE (rust/2025-08-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 87833828 SHA256 (rust/2025-08-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = bd48292b8582167a5e89ebe521c9754495403968c184b925df8b2ec1da344fc3 diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs deleted file mode 100644 index 9504f4a16f94..000000000000 --- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs +++ /dev/null @@ -1,23 +0,0 @@ -XXX: cc_tool is Gnu here because of patch-vendor_cc.rs. We need to seek need better solution. - ---- src/bootstrap/src/core/sanity.rs.orig 2025-09-06 18:37:35 UTC -+++ src/bootstrap/src/core/sanity.rs -@@ -338,12 +338,12 @@ than building it. - let cc_tool = build.cc_tool(*target); - if !cc_tool.is_like_clang() && !cc_tool.path().ends_with("emcc") { - // emcc works as well -- panic!( -- "Clang is required to build C code for Wasm targets, got `{}` instead\n\ -- this is because compiler-builtins is configured to build C source. Either \ -- ensure Clang is used, or adjust this configuration.", -- cc_tool.path().display() -- ); -+ //panic!( -+ // "Clang is required to build C code for Wasm targets, got `{}` instead\n\ -+ // this is because compiler-builtins is configured to build C source. Either \ -+ // ensure Clang is used, or adjust this configuration.", -+ // cc_tool.path().display() -+ //); - } - } - diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index 377f1a9346db..441cfdc2455a 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -21,7 +21,7 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.0/src/tool.rs.orig 2024-12-10 13:16:09 UTC +--- vendor/cc-1.2.0/src/tool.rs.orig 2024-12-10 13:16:09 UTC +++ vendor/cc-1.2.0/src/tool.rs @@ -174,9 +174,7 @@ impl Tool { @@ -34,107 +34,3 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.13/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.13/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.16/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.16/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.19/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.19/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.20/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.20/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.26/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.28/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.28/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.33/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.33/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.35/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.35/src/tool.rs -@@ -141,9 +141,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { - (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu), - (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), - (false, false, false, false, false) => { - cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");