From 2b5b344f2e522eab435c034a2372dfc220afb418 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 3 Aug 2023 21:38:01 +0200 Subject: [PATCH 1/4] rust-bootstrap: update to 1.71.1 --- srcpkgs/rust-bootstrap/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template index bb514c2f95b89..3a64f7c652078 100644 --- a/srcpkgs/rust-bootstrap/template +++ b/srcpkgs/rust-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'rust-bootstrap' pkgname=rust-bootstrap -version=1.71.0 +version=1.71.1 revision=1 short_desc="Rust programming language bootstrap toolchain" maintainer="Orphaned " @@ -31,24 +31,24 @@ case "$XBPS_TARGET_MACHINE" in ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz" checksum=" - e7c9c943b727de4f978cc9366e5c42536992d52ad418ffb9015e836723fd75ca - 46976bf8297efc65556ccddfec395d5327fbe303f9dabffd104628a37cb1de6d" + 33bc15de9f1d1cddbddf008f7f51a5af09867bc5fb40c65194a1f5f8b2972d40 + 672811c88fd5ffc5185d40eeecc7d257aeff47c9b48e0ced70ccea1e2559b273" ;; x86_64) distfiles=" ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz" checksum=" - c293d906769671d1cd18e945671bbd14e0b8a41df5075c47f33e6086fc8a1558 - 98ae6530c3a41167e9d93d11ea078be98a02f6d809a06d0d51af3ce0f73150d7" + 9a8a12b6c2a6f67d75ead0f343f891b78672c59387d1be28b46f3161ec2b251d + 31f392df564850d78be80adc625b06a3964a49ef5c519075b930f2042a422264" ;; x86_64-musl) distfiles=" ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz" checksum=" - abe1453c35d604a073e67ffc8c467b84dc0eca5c3a742d21b94794a047945197 - c91408683fe0918732525ec1e70263d3fc871ec8d15ae98768a1c6d7b9e3bff1" + 725d2cf0004ecc51e9c3b7949624744df28f74fbfbe53d742104c6a4e2121cef + 20667738a9005dda0386c8b6e59d55ce3044be11f78002f6640ca874d6911483" ;; # placeholders for user-supplied distfiles ppc64le) From 75c170f65c679054eff37ea69918e2ea1bb99004 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 3 Aug 2023 21:38:27 +0200 Subject: [PATCH 2/4] cargo-bootstrap: update to 1.71.1 --- srcpkgs/cargo-bootstrap/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template index dc49303c3ba11..07037341998af 100644 --- a/srcpkgs/cargo-bootstrap/template +++ b/srcpkgs/cargo-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'cargo-bootstrap' pkgname=cargo-bootstrap -version=1.71.0 +version=1.71.1 revision=1 short_desc="Bootstrap binaries of Rust package manager" maintainer="Orphaned " @@ -24,15 +24,15 @@ esac case "$XBPS_TARGET_MACHINE" in i686) distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz" - checksum="ee836c079c53e8e2ed5b2cbad849f991f2142b0b47b593a29b5cb39a76ee910e" + checksum="fca0d2e9a561a00eeacedbec15deed35e388d872282092257fe81c9b2467637d" ;; x86_64) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz" - checksum="fe6fb520f59966300ee661d18b37c36cb3e614877c4c01dfedf987b8a9c577e9" + checksum="55760c2f20356fe5cb2a4aa105e20693a573048f1dbc9daa41a0983fc0930b15" ;; x86_64-musl) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz" - checksum="91c80f1912cc1efaa7101ebf50e5222e91a29ccb05febe6fdd53e2504cfdc3c8" + checksum="865d33e427603db0a3514d58824ce51c0cf8a085b74ebd0d3d7bbf356f178279" ;; # placeholders for user-supplied distfiles ppc64le) From d79d66ddfc87af6c7f5aa2432566d3ce7d575113 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 3 Aug 2023 21:53:51 +0200 Subject: [PATCH 3/4] rust: update to 1.71.1 --- srcpkgs/rust/patches/0015-fix-lint-doc.patch | 45 -------------------- srcpkgs/rust/template | 4 +- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 srcpkgs/rust/patches/0015-fix-lint-doc.patch diff --git a/srcpkgs/rust/patches/0015-fix-lint-doc.patch b/srcpkgs/rust/patches/0015-fix-lint-doc.patch deleted file mode 100644 index e36e172753656..0000000000000 --- a/srcpkgs/rust/patches/0015-fix-lint-doc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 67b5990472e3cac643d8cf90f45fe42201ddec3c Mon Sep 17 00:00:00 2001 -From: jyn -Date: Mon, 10 Jul 2023 15:59:30 -0500 -Subject: [PATCH] Revert "Fix `x test lint-docs` when download-rustc is - enabled" - -This was not the correct fix. The problem was two-fold: -- `download-rustc` didn't respect `llvm.assertions` -- `rust-dev` was missing a bump to `download-ci-llvm-stamp` - -The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`. ---- - src/tools/lint-docs/src/groups.rs | 1 - - src/tools/lint-docs/src/lib.rs | 6 ------ - 2 files changed, 7 deletions(-) - -diff --git a/src/tools/lint-docs/src/groups.rs b/src/tools/lint-docs/src/groups.rs -index b11fb287cf4dd..5be8ef7996bb2 100644 ---- a/src/tools/lint-docs/src/groups.rs -+++ b/src/tools/lint-docs/src/groups.rs -@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> { - fn collect_groups(&self) -> Result> { - let mut result = BTreeMap::new(); - let mut cmd = Command::new(self.rustc_path); -- cmd.env_remove("LD_LIBRARY_PATH"); - cmd.arg("-Whelp"); - let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?; - if !output.status.success() { -diff --git a/src/tools/lint-docs/src/lib.rs b/src/tools/lint-docs/src/lib.rs -index fe29b9abda39a..b7c8b9ed2e318 100644 ---- a/src/tools/lint-docs/src/lib.rs -+++ b/src/tools/lint-docs/src/lib.rs -@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> { - fs::write(&tempfile, source) - .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?; - let mut cmd = Command::new(self.rustc_path); -- // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself. -- // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source, -- // and sometimes the paths conflict. In particular, when using `download-rustc`, -- // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`. -- // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler. -- cmd.env_remove("LD_LIBRARY_PATH"); - if options.contains(&"edition2015") { - cmd.arg("--edition=2015"); - } else { diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 0d955b4a8d146..a0ad9f01ea316 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -8,7 +8,7 @@ # uploaded to https://repo-default.voidlinux.org/distfiles/ # pkgname=rust -version=1.71.0 +version=1.71.1 revision=1 hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap" makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15" @@ -18,7 +18,7 @@ maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://www.rust-lang.org/" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb79771730573642034c96 +checksum=6fa90d50d1d529a75f6cc349784de57d7ec0ba2419b09bde7d335c25bd4e472e lib32disabled=yes make_check=no # CBA for now python_version=3 # needed for python files in rust-src From 4513be44818abbc8765df30310fad2572e386737 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 6 Aug 2023 21:33:44 +0200 Subject: [PATCH 4/4] cargo: update to 1.71.1 --- srcpkgs/cargo/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index ee450343b1277..59d222026bb2d 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.71.0 +version=1.71.1 revision=1 -_cargo_revision=0.72.0 +_cargo_commit=7f1d04c0053083b98fa50b69b6f56e339b0556a8 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel" makedepends="rust libcurl-devel openssl-devel" @@ -11,8 +11,8 @@ short_desc="Rust package manager" maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" -distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz" -checksum=c0c15a35852c114859cfe11c5c76ee12105d66d7c90e650af83ac7b8a6a856fc +distfiles="https://github.com/rust-lang/cargo/archive/${_cargo_commit}.tar.gz" +checksum=b142fd7581096a3290d3d8cd678dbd7c1192715dd26dc52cd243a2f3bd723640 replaces="cargo-tree>=0" build_options="static bindist"