Date: Wed, 27 May 2026 20:19:17 +0000 From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: de67a809c66e - main - lang/rust-nightly: update 1.97.0.2026051=?utf-8?Q?1 =E2=86=92 1.?=98.0.20260526 Message-ID: <6a1751c5.1cae2.279be6be@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=de67a809c66e1cc1c95224ce1f3a71cf891e05e0 commit de67a809c66e1cc1c95224ce1f3a71cf891e05e0 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2026-05-19 23:23:05 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2026-05-27 20:18:57 +0000 lang/rust-nightly: update 1.97.0.20260511 → 1.98.0.20260526 - Enable miri - Include a patch from upstream PR to avoid network access during build Approved by: rust (implicit) --- lang/rust-nightly/Makefile | 4 ++-- lang/rust-nightly/distinfo | 6 ++--- lang/rust-nightly/files/patch-pr156982 | 44 ++++++++++++++++++++++++++++++++++ lang/rust/Makefile | 6 +++-- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index e5505ce160c8..31966a928a6b 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.97.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.98.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= 2026-05-11 +NIGHTLY_DATE= 2026-05-26 BOOTSTRAPS_DATE= 2026-04-14 RUST_BOOTSTRAP_VERSION= beta diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 2999bc7b8482..6d9bea8addaf 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1778603247 -SHA256 (rust/2026-05-11/rustc-nightly-src.tar.xz) = 8ce98e209fac23962efde2a3e809faa577bc40e6f3b690357b59a5627d607281 -SIZE (rust/2026-05-11/rustc-nightly-src.tar.xz) = 242784108 +TIMESTAMP = 1779901280 +SHA256 (rust/2026-05-26/rustc-nightly-src.tar.xz) = b128326b31bf31aa943ee49c5dfbfac8b7a92660bffddbc774ac4937ff4034b7 +SIZE (rust/2026-05-26/rustc-nightly-src.tar.xz) = 242531460 SHA256 (rust/2026-04-14/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 0bb7405b32596f9c4ada34687d15d4a264ac9b3fc081f58eae75837fd23a85ec SIZE (rust/2026-04-14/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 92840908 SHA256 (rust/2026-04-14/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 2e5675d3aad9dfdb4a1d75de9a400fa57e38b222d0719c3e52e8c289ca1047a6 diff --git a/lang/rust-nightly/files/patch-pr156982 b/lang/rust-nightly/files/patch-pr156982 new file mode 100644 index 000000000000..a9f3368d572f --- /dev/null +++ b/lang/rust-nightly/files/patch-pr156982 @@ -0,0 +1,44 @@ +From b665316530342625ebc57d4c7137770c2625da84 Mon Sep 17 00:00:00 2001 +From: bjorn3 <17426603+bjorn3@users.noreply.github.com> +Date: Wed, 27 May 2026 12:08:59 +0200 +Subject: [PATCH] Allow building the source tarballs while offline + +Previously locally vendored dependencies wouldn't be reused when +building the source tarball, instead everything would be downloaded from +the internet again (if not in the cargo cache). +--- + src/bootstrap/src/core/build_steps/vendor.rs | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/bootstrap/src/core/build_steps/vendor.rs b/src/bootstrap/src/core/build_steps/vendor.rs +index 246598550553a..17bee20a525b6 100644 +--- src/bootstrap/src/core/build_steps/vendor.rs ++++ src/bootstrap/src/core/build_steps/vendor.rs +@@ -114,6 +114,13 @@ impl Step for Vendor { + cmd.arg("--sync").arg(sync_arg); + } + ++ // Reuse vendored dependencies when building source tarball for offline support. ++ if builder.config.vendor { ++ cmd.arg("--respect-source-config") ++ .arg("--config") ++ .arg(builder.src.join(".cargo").join("config.toml")); ++ } ++ + // Will read the libstd Cargo.toml + // which uses the unstable `public-dependency` feature. + cmd.env("RUSTC_BOOTSTRAP", "1"); +@@ -135,6 +142,13 @@ impl Step for Vendor { + cmd.arg("--versioned-dirs"); + } + ++ // Reuse vendored dependencies when building source tarball for offline support. ++ if builder.config.vendor { ++ cmd.arg("--respect-source-config") ++ .arg("--config") ++ .arg(builder.src.join("library").join(".cargo").join("config.toml")); ++ } ++ + // Will read the libstd Cargo.toml + // which uses the unstable `public-dependency` feature. + cmd.env("RUSTC_BOOTSTRAP", "1"); diff --git a/lang/rust/Makefile b/lang/rust/Makefile index a68a929132c7..d5a61cfa996f 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -115,9 +115,11 @@ MAKE_ENV+= RUST_BACKTRACE=1 .endif # per https://rust-lang.github.io/rustup/concepts/components.html -# rustc-dev is only useful on nightly +# rustc-dev and miri are only useful on nightly .if defined(NIGHTLY_DATE) -_COMPONENTS+= rustc-dev-${_PACKAGE_VERS}-${_RUST_TARGET} +_RUST_TOOLS+= miri cargo-miri +_COMPONENTS+= rustc-dev-${_PACKAGE_VERS}-${_RUST_TARGET} \ + miri-${_PACKAGE_VERS}-${_RUST_TARGET} .endif .if ${PORT_OPTIONS:MWASM} && ${PORT_OPTIONS:MDOCS}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1751c5.1cae2.279be6be>