From nobody Fri Apr 04 17:42:37 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 4ZTmCK5BMvz5s8rp; Fri, 04 Apr 2025 17:42:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTmCK47YXz3Sdj; Fri, 04 Apr 2025 17:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743788557; 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=K5cAEAUWTdBPMdud6xxkgjLP+5NAU9yLVD/nKufaA5k=; b=ivOSHXGhjRUz62f1cnQcBlqw8Z20SrIscZpMPy40IUGPmHYS54Rfcu7YaHICGwEsUh3ywo M5Wx4rPQ2cE1349v6HYrIPWkCgZNopedOLHoJpRsbWNDer1zXUwxAMdjZCG6vIjwlPj/VJ d3vh0BZaecH/Qlv9sNffsOpAUfWA5H6Hfo2ZWrvUXBh+hjU43SOAeQu8RZUu8uDdVMeCgT 5osvDlBm8oDeXl9JENETB+HxWah3fufsKBrlecCXegQWqZBVdXEV6Nm40JzG6cAUdq8ChL okdHkaIJEHc/RIOCcLr5Bsc7RXB4TmVxovj/l/cXBDMwNLtqE420CtkOUY16UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743788557; a=rsa-sha256; cv=none; b=NFL5suZdMb0Q2hbwBpoiMxPy5J37CxEePeH7hDGcU0aGF0sqUGBmLHkOYrQJeO262vMnCp Pljnctxa2l71tPmWODxlOZHtkcMmGyCs1JBclaPgcAfdO+A0Clm3pqVRMlaX/cAUh0/mof RWp8zjdtrDIobvqrpqo5j/l/n40FSJHKACwxWOjE59HEL8DG/nwRBah5wZLcNPBBx8SKOE 2bLdSWRb0bNFkprNYmtb6LGfXl9gIuerW87Dl1mjjSkpT8oW+f38Jl539pJjoqo4YBYz0x oZwoqtNZzGvCdEZMbkgXkct631J4zdFF4shdwpHbbIsX3HC/zxAmoMclibjeOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743788557; 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=K5cAEAUWTdBPMdud6xxkgjLP+5NAU9yLVD/nKufaA5k=; b=bwJtPrt0NjgnW/bvSoEOdmQjMZ6IGoVFBGINdO1oLkjDNmd/t9RUJ3v21+E+QzCly6/UXv yevYHIB4rCzZx22DVeOpr/EoavTa0iyZLneAEdDiWQySpzGGg0PC1bFn686DEEO9rNcVRu l8Y9QDcz4qsMYYLgA6sBRvcP16WKKwGQoILZe/SxH5alIN2/2pQ4eFP+UpS/vB+W43tPdm haRxV6YBEQZAhwUHyKH6Vejo87YatAprZquOo0wp080K22Paw2WmsrEQREkszGo18ou0v+ RGS0V90X7RokVYZkV6jg+O+Yx/1EM69goQ6vHEwUlUp0Nop8dgVHMEWs5luO/A== 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 4ZTmCK3hymzx0n; Fri, 04 Apr 2025 17:42:37 +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 534HgbGN024616; Fri, 4 Apr 2025 17:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 534Hgbeg024613; Fri, 4 Apr 2025 17:42:37 GMT (envelope-from git) Date: Fri, 4 Apr 2025 17:42:37 GMT Message-Id: <202504041742.534Hgbeg024613@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: 4f6416624e53 - main - =?utf-8?Q?lang/rust-nightly: update 1.87.0.20250324 =E2=86=92 1.88.0.20250402?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f6416624e53c5e351558b1e5d14b9a0b1be4849 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f6416624e53c5e351558b1e5d14b9a0b1be4849 commit 4f6416624e53c5e351558b1e5d14b9a0b1be4849 Author: Dmitry Marakasov AuthorDate: 2025-03-27 19:04:29 +0000 Commit: Dmitry Marakasov CommitDate: 2025-04-04 17:42:10 +0000 lang/rust-nightly: update 1.87.0.20250324 → 1.88.0.20250402 Approved by: rust (implicit) --- lang/rust-nightly/Makefile | 4 +- lang/rust-nightly/distinfo | 6 +-- ...rget_src_spec_targets_i686__unknown__freebsd.rs | 13 ------ .../patch-src_bootstrap_src_core_config_config.rs | 14 ++++++ lang/rust-nightly/files/patch-vendor_cc.rs | 52 ++++++++++++++++------ .../files/patch-vendor_git2-0.20.0_src_lib.rs | 18 ++++++++ .../patch-vendor_nix-0.28.0_src_sys_signal.rs | 20 --------- 7 files changed, 76 insertions(+), 51 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 6da24379e175..b7ae29e6f3c9 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.87.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.88.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-03-24 +NIGHTLY_DATE= 2025-04-02 BOOTSTRAPS_DATE= 2025-02-18 RUST_BOOTSTRAP_VERSION= beta diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 2430c20325cc..39765842bf25 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1742916607 -SHA256 (rust/2025-03-24/rustc-nightly-src.tar.xz) = bed8708021a9dc434dbc19ad57ab9c97526ef05a347dcd19098b3508f8e00dd7 -SIZE (rust/2025-03-24/rustc-nightly-src.tar.xz) = 283301568 +TIMESTAMP = 1743681715 +SHA256 (rust/2025-04-02/rustc-nightly-src.tar.xz) = 93ae6bc04d67dbe3ed8fa28e19331c60115d4848e8f70e21c141e4ff7ffc84d6 +SIZE (rust/2025-04-02/rustc-nightly-src.tar.xz) = 283623996 SHA256 (rust/2025-02-18/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 52ab3212d64b56a8da207fe976cbc8d266e962a61c742e6069137b10ff25c3c1 SIZE (rust/2025-02-18/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 85822636 SHA256 (rust/2025-02-18/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 11bae401884cce0306b415bb1202c2c63f81395677057fbbe12e9302951a9d3d diff --git a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs deleted file mode 100644 index 9e9be66e56a3..000000000000 --- a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs +++ /dev/null @@ -1,13 +0,0 @@ -i386 should be pentiumpro (no SSE2, no ...) - ---- compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs.orig 2025-03-03 19:34:25 UTC -+++ compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs -@@ -3,7 +3,7 @@ pub(crate) fn target() -> Target { - pub(crate) fn target() -> Target { - let mut base = base::freebsd::opts(); - base.rustc_abi = Some(RustcAbi::X86Sse2); -- base.cpu = "pentium4".into(); -+ base.cpu = "pentiumpro".into(); - base.max_atomic_width = Some(64); - base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-znotext"]); - base.stack_probes = StackProbeType::Inline; 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..7756a2cf4f13 --- /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!( ++ println!( + "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 f51a32b628a2..d8fe88b7682b 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -8,19 +8,6 @@ until LLVM can be updated to use libc++ by default. https://reviews.llvm.org/D77776 ---- vendor/cc-1.0.98/src/tool.rs.orig 2024-12-10 13:16:09 UTC -+++ vendor/cc-1.0.98/src/tool.rs -@@ -167,9 +167,7 @@ impl Tool { - - match (clang, accepts_cl_style_flags, gcc) { - (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }), -- (true, false, _) => Ok(ToolFamily::Clang { -- zig_cc: is_zig_cc(path, cargo_output), -- }), -+ (true, false, _) => Ok(ToolFamily::Gnu), - (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.0.99/src/tool.rs.orig 2024-12-10 13:16:09 UTC +++ vendor/cc-1.0.99/src/tool.rs @@ -167,9 +167,7 @@ impl Tool { @@ -60,3 +47,42 @@ 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.10/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.10/src/tool.rs +@@ -137,9 +137,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.17/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.17/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"); diff --git a/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs b/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs new file mode 100644 index 000000000000..1676f0c23188 --- /dev/null +++ b/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs @@ -0,0 +1,18 @@ +--- vendor/git2-0.20.0/src/lib.rs.orig 2025-02-21 20:02:44 UTC ++++ vendor/git2-0.20.0/src/lib.rs +@@ -759,6 +759,7 @@ fn init() { + unix, + not(target_os = "macos"), + not(target_os = "ios"), ++ not(target_os = "freebsd"), + feature = "https" + ))] + fn openssl_env_init() { +@@ -880,6 +881,7 @@ fn openssl_env_init() { + windows, + target_os = "macos", + target_os = "ios", ++ target_os = "freebsd", + not(feature = "https") + ))] + fn openssl_env_init() {} diff --git a/lang/rust-nightly/files/patch-vendor_nix-0.28.0_src_sys_signal.rs b/lang/rust-nightly/files/patch-vendor_nix-0.28.0_src_sys_signal.rs deleted file mode 100644 index fbe6d4e5a216..000000000000 --- a/lang/rust-nightly/files/patch-vendor_nix-0.28.0_src_sys_signal.rs +++ /dev/null @@ -1,20 +0,0 @@ ---- vendor/nix-0.28.0/src/sys/signal.rs.orig 2024-06-14 14:06:00 UTC -+++ vendor/nix-0.28.0/src/sys/signal.rs -@@ -1099,7 +1099,7 @@ pub type type_of_thread_id = libc::lwpid_t; - #[cfg(target_os = "freebsd")] - pub type type_of_thread_id = libc::lwpid_t; - /// Identifies a thread for [`SigevNotify::SigevThreadId`] --#[cfg(all(not(target_os = "hurd"), any(target_env = "gnu", target_env = "uclibc")))] -+#[cfg(all(not(any(target_os = "freebsd", target_os = "hurd")), any(target_env = "gnu", target_env = "uclibc")))] - pub type type_of_thread_id = libc::pid_t; - - /// Specifies the notification method used by a [`SigEvent`] -@@ -1349,7 +1349,7 @@ mod sigevent { - sev.sigev_value.sival_ptr = si_value as *mut libc::c_void; - sev._sigev_un._threadid = thread_id; - } -- #[cfg(any(target_env = "gnu", target_env = "uclibc"))] -+ #[cfg(all(not(target_os = "freebsd"), any(target_env = "gnu", target_env = "uclibc")))] - SigevNotify::SigevThreadId{signal, thread_id, si_value} => { - sev.sigev_notify = libc::SIGEV_THREAD_ID; - sev.sigev_signo = signal as libc::c_int;