From nobody Mon May 12 15:37:27 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 4Zx3dN2VmRz5wBWh; Mon, 12 May 2025 15:37:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zx3dN1g6vz4GJG; Mon, 12 May 2025 15:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747064248; 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=hHqs0WflejBT5Mwzg4HNq6e/3cnT3wErt6CLM8Po3Wo=; b=j8Abv/jNP4932bk7ESG03r+Gfz29IZGHz28aX3kLxiWM+rTFDeNfnb9ENGJwSxs3Xy6ilY fE9dE4a0634/GGg0tSLbLD1LPzD0ww/PHXOrHSsVLz15cX57TV5KlZfINo9iZoXuL4k1/8 wGvp6EErIeNW/cfzfMOejJrUBm+j18j5ynXWXGW1igWWascTD0ot2NOe9mDg5h3/FOLao/ KwH8Mn02fHp+5Reopm4/eoGQueqOO5kOr3Ct5pxE1pdgGYQ3cRmCGi/jAygnY1SEh8JDiw 5P5gO2oQboibcGTUNHPa9cEJsREpf6gOiCYIyG4VgLUkkW9nSSYpfrj6ZPVpOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747064248; 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=hHqs0WflejBT5Mwzg4HNq6e/3cnT3wErt6CLM8Po3Wo=; b=PfzULgz40FUVCOXY41HXX16ph+9tjcxNV9fRdClmsLVbT4COfz0WfnXK3RbdQJ2nG8Lq9F KPX6mdlG2xifTEhpDxMkZvuYXAmpRdtbN8yKGLXXDox8PeLglFrUkU1ushC9oQGZ55H003 oTXZns4zPfsJcGXr4ih1KrKZuLdCSbHlpBs9IjuWnZDHjYPgDlaSTuZI8Va1t+exZq67UF kHYRWfbw6HfONPzq+tttloAZIYOo/FVpKuTnWE19umen3H1JpkiG/Slhn+wYRzOF0VVXsd Dv8KYXKsx+byYSxXE1JstANlHaLV4rjc3SXeIGWNTvRrbys4RwsIQLCzH53Qkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747064248; a=rsa-sha256; cv=none; b=WYo0FBNyXKbQaEa1UakFpQ0acU7zVcYTGfuRp1nrZuO/Tt1x070ob335SScM1/cmc28A7Q YIGgoMgOx7J63fL1p8Rvad0y+rCvYOMDbW3Tl/z0DAqjgmPuUNvzlW6AIoe5AHicCJetCT 3BC6UDdQjIeP+eRPgt3iMmFvRLWo0/iXGb4P9eCVfRAPGA+zJ9B9bEqLUXXrLcMFVv9Lle UrYEXD9Ay/87GtuuRXiblaSWw1alibaZw0j79pOx0n/LqMYNe1CzX39dldRR3dDPLRKFbc 0VusxsLeHBr2H7Et0Wg+IFPsD7nk0kdQZbT/b0uypdnMR6sRH/B49HFD7EpZfg== 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 4Zx3dN0wQGz1Lvl; Mon, 12 May 2025 15:37:28 +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 54CFbRD7091386; Mon, 12 May 2025 15:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CFbRfF091383; Mon, 12 May 2025 15:37:27 GMT (envelope-from git) Date: Mon, 12 May 2025 15:37:27 GMT Message-Id: <202505121537.54CFbRfF091383@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: 65175e883843 - main - =?utf-8?Q?lang/rust-nightly: update 1.88.0.20250427 =E2=86=92 1.89.0.20250511?= 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: 65175e88384344ecff410b8b3fe6c6cd952c96fa Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=65175e88384344ecff410b8b3fe6c6cd952c96fa commit 65175e88384344ecff410b8b3fe6c6cd952c96fa Author: Dmitry Marakasov AuthorDate: 2025-05-12 12:55:30 +0000 Commit: Dmitry Marakasov CommitDate: 2025-05-12 15:37:22 +0000 lang/rust-nightly: update 1.88.0.20250427 → 1.89.0.20250511 Approved by: rust (implicit) --- lang/rust-nightly/Makefile | 4 ++-- lang/rust-nightly/distinfo | 6 +++--- .../files/patch-src_bootstrap_src_core_config_config.rs | 14 ++++++++++++++ lang/rust-nightly/files/patch-vendor_cc.rs | 17 ++--------------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index ddf0c6080ca0..a471ae71c1b7 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.88.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.89.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-04-27 +NIGHTLY_DATE= 2025-05-11 BOOTSTRAPS_DATE= 2025-04-02 RUST_BOOTSTRAP_VERSION= beta diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index b55fd74dcebc..4217c5534dcb 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1745842885 -SHA256 (rust/2025-04-27/rustc-nightly-src.tar.xz) = e91adec5f8e4344d038276a23b33ba7140b66013b983c42dbeb402a2d0aed98a -SIZE (rust/2025-04-27/rustc-nightly-src.tar.xz) = 282336840 +TIMESTAMP = 1747040402 +SHA256 (rust/2025-05-11/rustc-nightly-src.tar.xz) = bad0ba118859ebbae36a64459ef6bded37d18e586aeaba8c9e4fc19816ba7c1d +SIZE (rust/2025-05-11/rustc-nightly-src.tar.xz) = 283339704 SHA256 (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c8d0147c625faa5ce0e75c2509827bc4b190ad286e41411bce92023e00eb7a1d SIZE (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88062036 SHA256 (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 8bef59b74196fa9f7839bb491f6b32d0761a45c8d7178980ee3afd80231b836e diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs new file mode 100644 index 000000000000..fcbf2f47c9ca --- /dev/null +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs @@ -0,0 +1,14 @@ +--- src/bootstrap/src/core/config/config.rs.orig 2025-04-01 18:22:03 UTC ++++ src/bootstrap/src/core/config/config.rs +@@ -3016,9 +3016,9 @@ impl Config { + || source_version.minor == stage0_version.minor + 1))) + { + let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); +- fail(&format!( ++ eprintln!( + "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}" +- )); ++ ); + } + } + diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index a535d9677b91..3e9a42a7f8dd 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -21,19 +21,6 @@ https://reviews.llvm.org/D77776 (false, false, true) => Ok(ToolFamily::Gnu), (false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU"); ---- vendor/cc-1.1.22/src/tool.rs.orig 2024-12-10 13:16:09 UTC -+++ vendor/cc-1.1.22/src/tool.rs -@@ -174,9 +174,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.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 { @@ -73,8 +60,8 @@ 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.19/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.19/src/tool.rs +--- vendor/cc-1.2.21/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.21/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {