From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Update Rust toolchain to 1.59.0
Date: Sun, 17 Apr 2022 05:10:17 +0200 [thread overview]
Message-ID: <20220417031017.r2SrjiPjBFOwRpu86PiPBRHox-2wCS5l8AwTXw_WuRw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36269@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rust-toolchain
https://github.com/void-linux/void-packages/pull/36269
Update Rust toolchain to 1.59.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36269.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-toolchain-36269.patch --]
[-- Type: text/x-diff, Size: 52809 bytes --]
From 63300bde27a76c4ff4cb3b7ebeea4a7a26d61636 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 22 Mar 2022 17:27:07 +0530
Subject: [PATCH 1/8] rust-bootstrap: update to 1.59.0
---
srcpkgs/rust-bootstrap/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index bbedb66430b6..ffd17a91ab26 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.57.0
+version=1.59.0
revision=1
create_wrksrc=yes
short_desc="Rust programming language bootstrap toolchain"
@@ -29,38 +29,38 @@ distfiles="
case "$XBPS_TARGET_MACHINE" in
i686)
checksum="
- 9bade3fcd246b0ad6859fcf5d0a80d3eb833e5410efa3a5552c241865562461e
- 586e7fd521a058cbf4778abb67d7d078dd4820d356351d0b6a719e21d00966db"
+ 47f5702e5cc3414585e60d572bfeca85cd6d834d6705b509de1d4c8285b02a3a
+ 26e91818a36184998039aeaabbf0972a8610d0d250e4bc03de6f27a7843971b5"
;;
x86_64)
checksum="
- c42f40c5279a3a9d539cae93dbcab9d333777ad9a60a5b9f1086b874ef63db86
- ccdc72d06c90841b7227ec3630337881eeda3da5fbe87328d2e9d705f6f8016c"
+ 838de1fef855ef7733a87862c2575e8da9f3fa11fd0a8ce05c293038ea92356e
+ c854a9ee3dd8e5be9522c1581f75838c1cbae6dece3934b0004f138c4a5024a3"
;;
x86_64-musl)
checksum="
- 5b04e0e0bbf140f7c49baa6280114c28f59f6de50481bdd45074eebf629c174c
- 818213a6444503ed6adf0231d3c71de990d4c26926c62e8c602bb7e2d636fb94"
+ e0b543b36f8b3471975e5982f7c93894947af315932dd3305d1cf5763c4f5d4e
+ 473b6ddf598418db49efc21c3d2702cdaf9c78ee4ae00611c7d9e384a2d4dad7"
;;
ppc64le)
checksum="
- f43cb99109c3438c77c7079cdce4673df3320e310158e0b4d949c1babc4300fc
- fc07eb3e9f3d227428cc5b53ca868e3de375bc198ce4dce7b87a9246e6fec81a"
+ e5458f55e51f8baecab4ff1e43fae5c6e1c40d8171098ab633747ee0684b37bb
+ 15dee7705967e3351aff11c64ada30c4957b54066c7ee49b87be4b8155bd0a7d"
;;
ppc64le-musl)
checksum="
- 6b48e521ba8a070a7b992595e82c5a164cc01c93bbd9a7b3d4db362f4b060df8
- d7876e817fc95df2e81858fc9ddb95b10fb83b413277ea6dbdfa9a80fa0d990e"
+ f2b7e87c5f7fbab96c008374049ba1019c3503cf3c5b7742e536375c2a11f584
+ f2b7e87c5f7fbab96c008374049ba1019c3503cf3c5b7742e536375c2a11f584"
;;
ppc64)
checksum="
- 2ea5b66d2cd8b9c251590fd5bd3e23cedec658b61f541e2824ce3fdcda263982
- e9c1394771b1b24241d8938ad75c4a6ed8bfa043522c74767b3528f2289095c0"
+ 22380d50ca30793e00e4688bcc06180b7ce3e2badeae8320a2aae25f65966f52
+ 1217290e951ae84998d2d04a88d154b1da205e2638a3449c02c8e9256bff589c"
;;
ppc)
checksum="
- a1d7611b2d39224ba9a915009ae2a6639def42767370f50effd57770b3eb2150
- bc117ce5f0c81d2e14ea2d1832c0e908b1153caf49f295a9d28af2128f5fae44"
+ fe847f49ad4afa42858e6f712da3c7d8a3e502d9104eed84db440fdc53cc6f96
+ 5ead471b53d290960d49a7cec0ba01a082f5e6cfa18825366990d46797dc7161"
;;
*) broken="rust bootstrap binaries unavailable for ${XBPS_MACHINE}";;
esac
From d4818a2166b39d9c916f15402209d310a9195139 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 21 Mar 2022 18:23:35 +0530
Subject: [PATCH 2/8] rust: update to 1.59.0
---
.../rust/patches/0001-musl-void-setup.patch | 79 ++++++-------------
...007-fix-rustdoc-when-cross-compiling.patch | 12 +--
... 0010-do-not-export-LD_LIBRARY_PATH.patch} | 0
...kage-of-musl-libc-for-the-libc-crate.patch | 8 +-
srcpkgs/rust/patches/native-sysroot.patch | 22 +++---
srcpkgs/rust/template | 12 +--
6 files changed, 49 insertions(+), 84 deletions(-)
rename srcpkgs/rust/patches/{ld-library-path.patch => 0010-do-not-export-LD_LIBRARY_PATH.patch} (100%)
diff --git a/srcpkgs/rust/patches/0001-musl-void-setup.patch b/srcpkgs/rust/patches/0001-musl-void-setup.patch
index 427581c48f54..384f9e0c0dc2 100644
--- a/srcpkgs/rust/patches/0001-musl-void-setup.patch
+++ b/srcpkgs/rust/patches/0001-musl-void-setup.patch
@@ -133,9 +133,9 @@ diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index e9cc7662e63..4971534ba0e 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
-@@ -199,36 +199,7 @@ fn copy_self_contained_objects(
+@@ -200,36 +200,7 @@ fn copy_self_contained_objects(
- // Copies the CRT objects.
+ // Copies the libc and CRT objects.
//
- // rustc historically provides a more self-contained installation for musl targets
- // not requiring the presence of a native musl toolchain. For example, it can fall back
@@ -146,7 +146,7 @@ index e9cc7662e63..4971534ba0e 100644
- let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
- panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
- });
-- for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
+- for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
- copy_and_stamp(
- builder,
- &libdir_self_contained,
@@ -171,7 +171,7 @@ index e9cc7662e63..4971534ba0e 100644
let srcdir = builder
.wasi_root(target)
.unwrap_or_else(|| {
-@@ -312,15 +283,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -313,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/test/Cargo.toml"));
@@ -199,7 +199,7 @@ index e658d958d0a..914b1390b37 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -298,8 +297,6 @@ pub struct Target {
+@@ -299,8 +298,6 @@ pub struct Target {
pub sanitizers: Option<bool>,
pub profiler: Option<bool>,
pub crt_static: Option<bool>,
@@ -208,24 +208,24 @@ index e658d958d0a..914b1390b37 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub no_std: bool,
-@@ -493,7 +490,6 @@ struct Rust {
- default_linker: Option<String>,
- channel: Option<String>,
- description: Option<String>,
-- musl_root: Option<String>,
- rpath: Option<bool>,
- verbose_tests: Option<bool>,
- optimize_tests: Option<bool>,
-@@ -536,8 +532,6 @@ struct TomlTarget {
- sanitizers: Option<bool>,
- profiler: Option<bool>,
- crt_static: Option<bool>,
-- musl_root: Option<String>,
-- musl_libdir: Option<String>,
- wasi_root: Option<String>,
- qemu_rootfs: Option<String>,
- no_std: Option<bool>,
-@@ -872,7 +866,6 @@ pub fn parse(args: &[String]) -> Config {
+@@ -531,7 +528,6 @@ derive_merge! {
+ default_linker: Option<String>,
+ channel: Option<String>,
+ description: Option<String>,
+- musl_root: Option<String>,
+ rpath: Option<bool>,
+ verbose_tests: Option<bool>,
+ optimize_tests: Option<bool>,
+@@ -577,8 +573,6 @@ derive_merge! {
+ sanitizers: Option<bool>,
+ profiler: Option<bool>,
+ crt_static: Option<bool>,
+- musl_root: Option<String>,
+- musl_libdir: Option<String>,
+ wasi_root: Option<String>,
+ qemu_rootfs: Option<String>,
+ no_std: Option<bool>,
+@@ -938,7 +932,6 @@ impl Config {
set(&mut config.llvm_tools_enabled, rust.llvm_tools);
config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
config.rustc_default_linker = rust.default_linker;
@@ -233,7 +233,7 @@ index e658d958d0a..914b1390b37 100644
config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings));
set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -918,8 +911,6 @@ pub fn parse(args: &[String]) -> Config {
+@@ -984,8 +977,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@@ -285,15 +285,7 @@ diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 2d4e1527897..3abe9f4a143 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
-@@ -277,7 +277,6 @@ pub struct Build {
- struct Crate {
- name: Interned<String>,
- deps: HashSet<Interned<String>>,
-- id: String,
- path: PathBuf,
- }
-
-@@ -1056,25 +1055,6 @@ fn crt_static(&self, target: TargetSelection) -> Option<bool> {
+@@ -1050,25 +1051,6 @@ impl Build {
}
}
@@ -319,27 +311,6 @@ index 2d4e1527897..3abe9f4a143 100644
/// Returns the sysroot for the wasi target, if defined
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
-diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs
-index a38391c7b88..65e229697dc 100644
---- a/src/bootstrap/metadata.rs
-+++ b/src/bootstrap/metadata.rs
-@@ -14,7 +14,6 @@ struct Output {
-
- #[derive(Deserialize)]
- struct Package {
-- id: String,
- name: String,
- source: Option<String>,
- manifest_path: String,
-@@ -50,7 +49,7 @@ pub fn build(build: &mut Build) {
- .filter(|dep| dep.source.is_none())
- .map(|dep| INTERNER.intern_string(dep.name))
- .collect();
-- build.crates.insert(name, Crate { name, id: package.id, deps, path });
-+ build.crates.insert(name, Crate { name, deps, path });
- }
- }
- }
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index d7db2cef24f..a791177956d 100644
--- a/src/bootstrap/sanity.rs
diff --git a/srcpkgs/rust/patches/0007-fix-rustdoc-when-cross-compiling.patch b/srcpkgs/rust/patches/0007-fix-rustdoc-when-cross-compiling.patch
index adaf86f2f451..2cc1f6b900d3 100644
--- a/srcpkgs/rust/patches/0007-fix-rustdoc-when-cross-compiling.patch
+++ b/srcpkgs/rust/patches/0007-fix-rustdoc-when-cross-compiling.patch
@@ -11,26 +11,26 @@ diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
index e4396d530..cb2312028 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
-@@ -20,14 +20,11 @@ fn main() {
+@@ -22,14 +22,11 @@ fn main() {
Err(_) => 0,
};
-- let mut dylib_path = bootstrap::util::dylib_path();
+- let mut dylib_path = dylib_path();
- dylib_path.insert(0, PathBuf::from(libdir.clone()));
-
let mut cmd = Command::new(rustdoc);
cmd.args(&args)
.arg("--sysroot")
.arg(&sysroot)
-- .env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
-+ .env(bootstrap::util::dylib_path_var(), PathBuf::from(libdir.clone()));
+- .env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
++ .env(dylib_path_var(), PathBuf::from(libdir.clone()));
// Force all crates compiled by this compiler to (a) be unstable and (b)
// allow the `rustc_private` feature to link to other unstable crates
-@@ -60,7 +57,7 @@ fn main() {
+@@ -62,7 +59,7 @@ fn main() {
eprintln!(
"rustdoc command: {:?}={:?} {:?}",
- bootstrap::util::dylib_path_var(),
+ dylib_path_var(),
- env::join_paths(&dylib_path).unwrap(),
+ PathBuf::from(libdir.clone()),
cmd,
diff --git a/srcpkgs/rust/patches/ld-library-path.patch b/srcpkgs/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
similarity index 100%
rename from srcpkgs/rust/patches/ld-library-path.patch
rename to srcpkgs/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
diff --git a/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index a9ca5f6c7bba..8a18e414e209 100644
--- a/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -12,14 +12,14 @@ diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
index 238da24b..ffb05ee7 100644
--- a/vendor/libc/src/unix/mod.rs
+++ b/vendor/libc/src/unix/mod.rs
-@@ -299,11 +299,11 @@ cfg_if! {
- // cargo build, don't pull in anything extra as the libstd dep
- // already pulls in all libs.
+@@ -329,11 +329,11 @@ cfg_if! {
+ #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+ extern {}
} else if #[cfg(target_env = "musl")] {
+ #[link(name = "c")]
+ extern {}
#[cfg_attr(feature = "rustc-dep-of-std",
-- link(name = "c", kind = "static",
+- link(name = "c", kind = "static", modifiers = "-bundle",
+ link(name = "gcc", kind = "static-nobundle",
cfg(target_feature = "crt-static")))]
- #[cfg_attr(feature = "rustc-dep-of-std",
diff --git a/srcpkgs/rust/patches/native-sysroot.patch b/srcpkgs/rust/patches/native-sysroot.patch
index a23046220e9c..a8ff034e7370 100644
--- a/srcpkgs/rust/patches/native-sysroot.patch
+++ b/srcpkgs/rust/patches/native-sysroot.patch
@@ -26,23 +26,23 @@ diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 06b7a8c55..d8e9275ad 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
-@@ -292,6 +292,7 @@ pub struct Target {
- pub ar: Option<PathBuf>,
+@@ -294,6 +294,7 @@ pub struct Target {
pub ranlib: Option<PathBuf>,
+ pub default_linker: Option<PathBuf>,
pub linker: Option<PathBuf>,
+ pub sysroot: Option<PathBuf>,
pub ndk: Option<PathBuf>,
pub sanitizers: Option<bool>,
pub profiler: Option<bool>,
-@@ -525,6 +526,7 @@ struct TomlTarget {
- ar: Option<String>,
- ranlib: Option<String>,
- linker: Option<String>,
-+ sysroot: Option<String>,
- llvm_config: Option<String>,
- llvm_filecheck: Option<String>,
- android_ndk: Option<String>,
-@@ -909,6 +911,7 @@ impl Config {
+@@ -567,6 +568,7 @@ derive_merge! {
+ ranlib: Option<String>,
+ default_linker: Option<PathBuf>,
+ linker: Option<String>,
++ sysroot: Option<String>,
+ llvm_config: Option<String>,
+ llvm_filecheck: Option<String>,
+ android_ndk: Option<String>,
+@@ -976,6 +978,7 @@ impl Config {
target.ar = cfg.ar.map(PathBuf::from);
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 560a629f3da2..49de23df8acd 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.57.0
+version=1.59.0
revision=1
wrksrc="rustc-${version}-src"
hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=3546f9c3b91b1f8b8efd26c94d6b50312c08210397b4072ed2748e2bd4445c1a
+checksum=a7c8eeaee85bfcef84c96b02b3171d1e6540d15179ff83dddd9eafba185f85f9
lib32disabled=yes
make_check=no # CBA for now
@@ -216,14 +216,8 @@ do_install() {
cd ${DESTDIR}/usr/lib
# symlinks instead of copies
- mv *.so rustlib/${RUST_TARGET}/lib
+ rm *.so
ln -sf rustlib/${RUST_TARGET}/lib/*.so .
-
- # executable used for split dwarf, currently unstable on linux.
- # it's copied directly from the local llvm package, but
- # FIXME: cross builds are installing the version from the build machine,
- # it shouldn't be necessary to remove it
- rm rustlib/${RUST_TARGET}/bin/rust-llvm-dwp
}
rust-doc_package() {
From 4c3f58aeb79d2bc123c4c8185b9a4c93460ccb46 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 22 Mar 2022 17:31:31 +0530
Subject: [PATCH 3/8] cargo-bootstrap: update to 1.59.0
---
srcpkgs/cargo-bootstrap/template | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index e75f8763b5b8..bb7490566a4f 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-bootstrap'
pkgname=cargo-bootstrap
-version=0.58.0
+version=1.59.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="q66 <daniel@octaforge.org>"
@@ -11,43 +11,39 @@ lib32disabled=yes
nostrip=yes
_bootstrap_url="https://static.rust-lang.org/dist"
-_bootver=1.57.0
# we don't use upstream cargo binaries for ppc32, as they are busted (probably
# a dependency is wrong, which results in failed signature verification when
# updating the crates.io index)
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686|ppc64le) ;;
- *)
- _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles"
- _bootver=${version}
- ;;
+ *) _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles" ;;
esac
-wrksrc="cargo-${_bootver}-${RUST_TARGET}"
-distfiles="${_bootstrap_url}/cargo-${_bootver}-${RUST_TARGET}.tar.xz"
+wrksrc="cargo-${version}-${RUST_TARGET}"
+distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
case "$XBPS_TARGET_MACHINE" in
i686)
- checksum="9898a1fae2647f930fa14b9c160a1d22e67ccc70ac0d2d8f79ef1ffcf8d89af7"
+ checksum="4f282b8a4dadf53ba3f8784cefe0c2be908179ba81b7b29a0db4a11b6a3f8849"
;;
x86_64)
- checksum="ed2013713ae742895af5df8d91c5430ba9ba3c781e3bc7f3471b220cc06d565d"
+ checksum="f56ebfb333ea46e4429377bf4b16a2ec889d61640a41c3093577cdd8f3c80b96"
;;
x86_64-musl)
- checksum="0d8564d0348843d6c08d98990d9eac50b7b7ab790f89d514b4f45079e786d932"
+ checksum="95f2727f22f40d7a294f08d24dc7b5f4fb4fe3991854becceffa75bf8f049745"
;;
ppc64le)
- checksum="599cf1b5a8cdbf76d591621bc9222aefa60e2f5fd378ae71c4dcf4514c47122e"
+ checksum="fdab44481286db3ea8f4b6d409e648355009ef458188352d5e2c5799f7614fbd"
;;
ppc64le-musl)
- checksum="99ae7661c62617ac42adacb50cce9ae8d019bcf85e987b98fbc27240bceb1dd9"
+ checksum="f2b7e87c5f7fbab96c008374049ba1019c3503cf3c5b7742e536375c2a11f584"
;;
ppc64)
- checksum="c64b9cce7a3ceaf5c310fad70be33077f1e6dea1384767fcf744732c0daa7473"
+ checksum="8535bc99aa88daa8f7fc001a9a7588f1d024a8d2aa38462532745d5327233cae"
;;
ppc)
- checksum="e67c2a7d16b3c732a1dcb663d031daf6eaca4b74d1d15196086c53c0c3a5b0a2"
+ checksum="377942d80eade23684a2dc4fa89782e782ae7f90038b7d56bf1bb48afc822c8f"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_MACHINE}";;
esac
From cd4f572e7972740750001acb06d4def0dba56806 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 22 Mar 2022 09:15:03 +0530
Subject: [PATCH 4/8] cargo: update to 1.59.0
---
srcpkgs/cargo/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index c512e7005833..d65a3e51c172 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
# Template file for 'cargo'
pkgname=cargo
-version=0.58.0
+version=1.59.0
revision=1
-wrksrc="cargo-${version}"
+wrksrc="cargo-rust-${version}"
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
@@ -11,10 +11,10 @@ short_desc="Rust package manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://crates.io/"
-distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz
- https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.5.tar.gz"
-checksum="e1d6f55414a29906d24b13c687996b5220e08ccce9c682e4c02851138fc7093f
- 57db07eb38b0aaf7951c79b4639819cb84bc4269507091afea7267e10a54e079"
+distfiles="https://github.com/rust-lang/cargo/archive/rust-${version}.tar.gz
+ https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.7.tar.gz"
+checksum="e3bcc26be1a07ecd6eaa07a46a6343558924c39db862ffe1adffca90feb9371f
+ 560fa9a67019d3b3db7c4b887cbc35cc8e87a436b04d5943d5cdf844b4275229"
replaces="cargo-tree>=0"
build_options="static bindist"
@@ -28,7 +28,7 @@ if [ -z "$_build_static" ]; then
makedepends+=" libgit2-devel"
fi
-post_extract() {
+pre_patch() {
mv ../crossbeam-* crossbeam-utils
}
From 5de851abfc624b2c2b206ee40a70c80449beef04 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 17 Apr 2022 00:18:50 +0530
Subject: [PATCH 5/8] rust-bootstrap: update to 1.60.0
---
srcpkgs/rust-bootstrap/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index ffd17a91ab26..090ae35d64bd 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.59.0
+version=1.60.0
revision=1
create_wrksrc=yes
short_desc="Rust programming language bootstrap toolchain"
@@ -29,38 +29,38 @@ distfiles="
case "$XBPS_TARGET_MACHINE" in
i686)
checksum="
- 47f5702e5cc3414585e60d572bfeca85cd6d834d6705b509de1d4c8285b02a3a
- 26e91818a36184998039aeaabbf0972a8610d0d250e4bc03de6f27a7843971b5"
+ 202b2ea1ce8981990996d3ffd6d8f94737e714fa448c0691a3fd738b74ec43df
+ 04a7ed0ab0811e3d4dc86053af1d49a8654bfdd6a1a5c22419e8a2c42c33c382"
;;
x86_64)
checksum="
- 838de1fef855ef7733a87862c2575e8da9f3fa11fd0a8ce05c293038ea92356e
- c854a9ee3dd8e5be9522c1581f75838c1cbae6dece3934b0004f138c4a5024a3"
+ fc0b41c15e348ad0eeb7a6c015a922a2ac95e9577e531635558b26d99399f315
+ 6fb8ee3650beb10836ae48a9aaa535473e64eaca20695b88113267aea3c7557f"
;;
x86_64-musl)
checksum="
- e0b543b36f8b3471975e5982f7c93894947af315932dd3305d1cf5763c4f5d4e
- 473b6ddf598418db49efc21c3d2702cdaf9c78ee4ae00611c7d9e384a2d4dad7"
+ 0b8b5261575575bae6768a27fcd43b01784ee7e29249ca8fd7b1d3b5e1fab5a9
+ 0801252694e49eca069003f311e23e124a6dee3557e613133dc2e3cab7bed64d"
;;
ppc64le)
checksum="
- e5458f55e51f8baecab4ff1e43fae5c6e1c40d8171098ab633747ee0684b37bb
- 15dee7705967e3351aff11c64ada30c4957b54066c7ee49b87be4b8155bd0a7d"
+ 6647cfa1f27ddeb444157fd84bd8d9229b9d2c39226a607e4017845023dd9fd2
+ 3bfce36ef03027574f2f1e17d24b172bd086a0a3adbd8944955d18ad9919a78e"
;;
ppc64le-musl)
checksum="
- f2b7e87c5f7fbab96c008374049ba1019c3503cf3c5b7742e536375c2a11f584
- f2b7e87c5f7fbab96c008374049ba1019c3503cf3c5b7742e536375c2a11f584"
+ badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb
+ badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb"
;;
ppc64)
checksum="
- 22380d50ca30793e00e4688bcc06180b7ce3e2badeae8320a2aae25f65966f52
- 1217290e951ae84998d2d04a88d154b1da205e2638a3449c02c8e9256bff589c"
+ 44c97180c4c99ba80af5638ec34cefef9e25c67f0061f1c784847e81c9812125
+ b390bec6ce697a6347fb6c5dd70bb23f562cc9945ed215f10fd08dbc1a38293f"
;;
ppc)
checksum="
- fe847f49ad4afa42858e6f712da3c7d8a3e502d9104eed84db440fdc53cc6f96
- 5ead471b53d290960d49a7cec0ba01a082f5e6cfa18825366990d46797dc7161"
+ 988c8e5f1926b1329d41c742134aa9e62b250b08af4a46a6ef3184d7ad518a4f
+ 81138f4b9c8ec6f68fa81f10ec0da5962a7bb433a85009fe970ec3bb6596b1af"
;;
*) broken="rust bootstrap binaries unavailable for ${XBPS_MACHINE}";;
esac
From 39dcd4b5c061e9ecc5f74af263f579b3453e627a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 17 Apr 2022 00:21:32 +0530
Subject: [PATCH 6/8] rust: update to 1.60.0
---
.../rust/patches/0001-musl-void-setup.patch | 10 +-
srcpkgs/rust/patches/xxx-ppcle.patch | 543 ------------------
srcpkgs/rust/template | 5 +-
3 files changed, 8 insertions(+), 550 deletions(-)
delete mode 100644 srcpkgs/rust/patches/xxx-ppcle.patch
diff --git a/srcpkgs/rust/patches/0001-musl-void-setup.patch b/srcpkgs/rust/patches/0001-musl-void-setup.patch
index 384f9e0c0dc2..b7c54834e19e 100644
--- a/srcpkgs/rust/patches/0001-musl-void-setup.patch
+++ b/srcpkgs/rust/patches/0001-musl-void-setup.patch
@@ -133,7 +133,7 @@ diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index e9cc7662e63..4971534ba0e 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
-@@ -200,36 +200,7 @@ fn copy_self_contained_objects(
+@@ -200,38 +200,7 @@ fn copy_self_contained_objects(
// Copies the libc and CRT objects.
//
@@ -164,14 +164,16 @@ index e9cc7662e63..4971534ba0e 100644
- target_deps.push((target, DependencyType::TargetSelfContained));
- }
-
-- let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
-- target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
+- if !target.starts_with("s390x") {
+- let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
+- target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
+- }
- } else if target.ends_with("-wasi") {
+ if target.ends_with("-wasi") {
let srcdir = builder
.wasi_root(target)
.unwrap_or_else(|| {
-@@ -313,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -315,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/test/Cargo.toml"));
diff --git a/srcpkgs/rust/patches/xxx-ppcle.patch b/srcpkgs/rust/patches/xxx-ppcle.patch
deleted file mode 100644
index 9473e7ad98f3..000000000000
--- a/srcpkgs/rust/patches/xxx-ppcle.patch
+++ /dev/null
@@ -1,543 +0,0 @@
-From b92ce1ed0ac8d95831a43f4395544c17a0816c9b Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sat, 3 Jul 2021 21:02:03 +0200
-Subject: [PATCH] initial ppcle port
-
----
- compiler/rustc_middle/src/ty/layout.rs | 5 ++++-
- compiler/rustc_target/src/spec/mod.rs | 2 ++
- .../src/spec/powerpcle_unknown_linux_gnu.rs | 15 +++++++++++++++
- .../src/spec/powerpcle_unknown_linux_musl.rs | 15 +++++++++++++++
- src/bootstrap/bootstrap.py | 2 ++
- .../codegen/abi-main-signature-16bit-c-int.rs | 1 +
- src/test/codegen/fastcall-inreg.rs | 1 +
- src/test/codegen/global_asm.rs | 1 +
- src/test/codegen/global_asm_include.rs | 1 +
- src/test/codegen/global_asm_x2.rs | 1 +
- src/test/codegen/repr-transparent-aggregates-1.rs | 1 +
- src/test/codegen/repr-transparent-aggregates-2.rs | 1 +
- src/test/codegen/stack-probes.rs | 1 +
- .../run-make-fulldeps/atomic-lock-free/Makefile | 2 ++
- src/test/ui/abi/stack-probes-lto.rs | 1 +
- src/test/ui/abi/stack-probes.rs | 1 +
- src/test/ui/borrowck/borrowck-asm.rs | 1 +
- src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs | 1 +
- src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs | 1 +
- src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs | 1 +
- src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs | 1 +
- src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs | 1 +
- src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs | 1 +
- src/test/ui/target-feature/gate.rs | 1 +
- src/test/ui/target-feature/invalid-attribute.rs | 1 +
- src/tools/compiletest/src/util.rs | 1 +
- vendor/cc/src/lib.rs | 1 +
- vendor/rustc-ap-rustc_target/src/spec/mod.rs | 2 ++
- .../src/spec/powerpcle_unknown_linux_gnu.rs | 15 +++++++++++++++
- .../src/spec/powerpcle_unknown_linux_musl.rs | 15 +++++++++++++++
- vendor/target-lexicon/src/targets.rs | 7 +++++++
- vendor/tikv-jemallocator/benches/roundtrip.rs | 3 ++-
- vendor/tikv-jemallocator/src/lib.rs | 3 ++-
- 37 files changed, 111 insertions(+), 6 deletions(-)
- create mode 100644 compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
- create mode 100644 compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
- create mode 100644 vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
- create mode 100644 vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-
-diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs
-index c2e9dba6..8147a3c3 100644
---- a/compiler/rustc_middle/src/ty/layout.rs
-+++ b/compiler/rustc_middle/src/ty/layout.rs
-@@ -2753,6 +2753,8 @@ where
- target.os == "linux" && target.arch == "sparc64" && target_env_gnu_like;
- let linux_powerpc_gnu_like =
- target.os == "linux" && target.arch == "powerpc" && target_env_gnu_like;
-+ let linux_powerpcle_gnu_like =
-+ target.os == "linux" && target.arch == "powerpcle" && target_env_gnu_like;
- use SpecAbi::*;
- let rust_abi = matches!(sig.abi, RustIntrinsic | PlatformIntrinsic | Rust | RustCall);
-
-@@ -2850,7 +2852,8 @@ where
- || (!win_x64_gnu
- && !linux_s390x_gnu_like
- && !linux_sparc64_gnu_like
-- && !linux_powerpc_gnu_like)
-+ && !linux_powerpc_gnu_like
-+ && !linux_powerpcle_gnu_like)
- {
- arg.mode = PassMode::Ignore;
- }
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 2af46693..986d84e0 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -716,6 +716,8 @@ supported_targets! {
- ("powerpc-unknown-linux-gnu", powerpc_unknown_linux_gnu),
- ("powerpc-unknown-linux-gnuspe", powerpc_unknown_linux_gnuspe),
- ("powerpc-unknown-linux-musl", powerpc_unknown_linux_musl),
-+ ("powerpcle-unknown-linux-gnu", powerpcle_unknown_linux_gnu),
-+ ("powerpcle-unknown-linux-musl", powerpcle_unknown_linux_musl),
- ("powerpc64-unknown-linux-gnu", powerpc64_unknown_linux_gnu),
- ("powerpc64-unknown-linux-musl", powerpc64_unknown_linux_musl),
- ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu),
-diff --git a/compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
-new file mode 100644
-index 00000000..780c20a3
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
-@@ -0,0 +1,15 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::linux_gnu_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpcle-unknown-linux-gnu".to_string(),
-+ pointer_width: 32,
-+ data_layout: "e-m:e-p:32:32-i64:64-n32".to_string(),
-+ arch: "powerpc".to_string(),
-+ options: TargetOptions { mcount: "_mcount".to_string(), ..base },
-+ }
-+}
-diff --git a/compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-new file mode 100644
-index 00000000..9b848ccf
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-@@ -0,0 +1,15 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::linux_musl_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpcle-unknown-linux-musl".to_string(),
-+ pointer_width: 32,
-+ data_layout: "e-m:e-p:32:32-i64:64-n32".to_string(),
-+ arch: "powerpc".to_string(),
-+ options: TargetOptions { mcount: "_mcount".to_string(), ..base },
-+ }
-+}
-diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index 4111420e..cd69a8ec 100644
---- a/src/bootstrap/bootstrap.py
-+++ b/src/bootstrap/bootstrap.py
-@@ -289,9 +289,11 @@ def default_build_triple(verbose):
- 'i686': 'i686',
- 'i786': 'i686',
- 'powerpc': 'powerpc',
-+ 'powerpcle': 'powerpcle',
- 'powerpc64': 'powerpc64',
- 'powerpc64le': 'powerpc64le',
- 'ppc': 'powerpc',
-+ 'ppcle': 'powerpcle',
- 'ppc64': 'powerpc64',
- 'ppc64le': 'powerpc64le',
- 's390x': 's390x',
-diff --git a/src/test/codegen/abi-main-signature-16bit-c-int.rs b/src/test/codegen/abi-main-signature-16bit-c-int.rs
-index 4ed491df..82ec7755 100644
---- a/src/test/codegen/abi-main-signature-16bit-c-int.rs
-+++ b/src/test/codegen/abi-main-signature-16bit-c-int.rs
-@@ -9,6 +9,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-riscv64
- // ignore-s390x
-diff --git a/src/test/codegen/fastcall-inreg.rs b/src/test/codegen/fastcall-inreg.rs
-index adbeae45..0fd0a9e6 100644
---- a/src/test/codegen/fastcall-inreg.rs
-+++ b/src/test/codegen/fastcall-inreg.rs
-@@ -16,6 +16,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-riscv64
- // ignore-amdgcn
-diff --git a/src/test/codegen/global_asm.rs b/src/test/codegen/global_asm.rs
-index 57d8aeb1..e0b1b692 100644
---- a/src/test/codegen/global_asm.rs
-+++ b/src/test/codegen/global_asm.rs
-@@ -12,6 +12,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-amdgcn
- // ignore-sparc
-diff --git a/src/test/codegen/global_asm_include.rs b/src/test/codegen/global_asm_include.rs
-index 44402619..62ecfa6d 100644
---- a/src/test/codegen/global_asm_include.rs
-+++ b/src/test/codegen/global_asm_include.rs
-@@ -12,6 +12,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-amdgcn
- // ignore-sparc
-diff --git a/src/test/codegen/global_asm_x2.rs b/src/test/codegen/global_asm_x2.rs
-index d632d0dd..29f97775 100644
---- a/src/test/codegen/global_asm_x2.rs
-+++ b/src/test/codegen/global_asm_x2.rs
-@@ -12,6 +12,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-amdgcn
- // ignore-sparc
-diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/src/test/codegen/repr-transparent-aggregates-1.rs
-index 3017adb4..632565bb 100644
---- a/src/test/codegen/repr-transparent-aggregates-1.rs
-+++ b/src/test/codegen/repr-transparent-aggregates-1.rs
-@@ -7,6 +7,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-riscv64 see codegen/riscv-abi
- // ignore-windows
-diff --git a/src/test/codegen/repr-transparent-aggregates-2.rs b/src/test/codegen/repr-transparent-aggregates-2.rs
-index 429d760b..57e75f95 100644
---- a/src/test/codegen/repr-transparent-aggregates-2.rs
-+++ b/src/test/codegen/repr-transparent-aggregates-2.rs
-@@ -6,6 +6,7 @@
- // ignore-emscripten
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64 see codegen/riscv-abi
-diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs
-index 9bd351df..29073eb5 100644
---- a/src/test/codegen/stack-probes.rs
-+++ b/src/test/codegen/stack-probes.rs
-@@ -3,6 +3,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/run-make-fulldeps/atomic-lock-free/Makefile b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
-index 9e8b4fab..402d37a4 100644
---- a/src/test/run-make-fulldeps/atomic-lock-free/Makefile
-+++ b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
-@@ -36,6 +36,8 @@ ifeq ($(filter powerpc,$(LLVM_COMPONENTS)),powerpc)
- nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
- $(RUSTC) --target=powerpc-unknown-linux-gnuspe atomic_lock_free.rs
- nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
-+ $(RUSTC) --target=powerpcle-unknown-linux-gnu atomic_lock_free.rs
-+ nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
- $(RUSTC) --target=powerpc64-unknown-linux-gnu atomic_lock_free.rs
- nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
- $(RUSTC) --target=powerpc64le-unknown-linux-gnu atomic_lock_free.rs
-diff --git a/src/test/ui/abi/stack-probes-lto.rs b/src/test/ui/abi/stack-probes-lto.rs
-index 90df1f3f..8c6dda8b 100644
---- a/src/test/ui/abi/stack-probes-lto.rs
-+++ b/src/test/ui/abi/stack-probes-lto.rs
-@@ -4,6 +4,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-s390x
- // ignore-sparc
- // ignore-sparc64
-diff --git a/src/test/ui/abi/stack-probes.rs b/src/test/ui/abi/stack-probes.rs
-index e998dd0f..9472e538 100644
---- a/src/test/ui/abi/stack-probes.rs
-+++ b/src/test/ui/abi/stack-probes.rs
-@@ -4,6 +4,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-s390x
- // ignore-sparc
- // ignore-sparc64
-diff --git a/src/test/ui/borrowck/borrowck-asm.rs b/src/test/ui/borrowck/borrowck-asm.rs
-index a3f64524..faf9adb4 100644
---- a/src/test/ui/borrowck/borrowck-asm.rs
-+++ b/src/test/ui/borrowck/borrowck-asm.rs
-@@ -1,6 +1,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs b/src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs
-index 2868d3d3..5c6e325b 100644
---- a/src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs
-+++ b/src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs
-@@ -4,6 +4,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs b/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs
-index e3bc7d29..49f53f67 100644
---- a/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs
-+++ b/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs
-@@ -1,6 +1,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs b/src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs
-index daae0c81..fd505c86 100644
---- a/src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs
-+++ b/src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs
-@@ -5,6 +5,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs b/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs
-index 9c62532c..baa1c1ba 100644
---- a/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs
-+++ b/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs
-@@ -1,6 +1,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs b/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs
-index 72edb339..2fec991d 100644
---- a/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs
-+++ b/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs
-@@ -1,6 +1,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs b/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs
-index acf4cf9f..dfad0775 100644
---- a/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs
-+++ b/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs
-@@ -1,6 +1,7 @@
- // ignore-s390x
- // ignore-emscripten
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/target-feature/gate.rs b/src/test/ui/target-feature/gate.rs
-index 164830fe..531a4b45 100644
---- a/src/test/ui/target-feature/gate.rs
-+++ b/src/test/ui/target-feature/gate.rs
-@@ -5,6 +5,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/target-feature/invalid-attribute.rs b/src/test/ui/target-feature/invalid-attribute.rs
-index 5ea78215..47e7887a 100644
---- a/src/test/ui/target-feature/invalid-attribute.rs
-+++ b/src/test/ui/target-feature/invalid-attribute.rs
-@@ -5,6 +5,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
-index 7dbd7094..08c9de3c 100644
---- a/src/tools/compiletest/src/util.rs
-+++ b/src/tools/compiletest/src/util.rs
-@@ -67,6 +67,7 @@ const ARCH_TABLE: &[(&str, &str)] = &[
- ("msp430", "msp430"),
- ("nvptx64", "nvptx64"),
- ("powerpc", "powerpc"),
-+ ("powerpcle", "powerpc"),
- ("powerpc64", "powerpc64"),
- ("powerpc64le", "powerpc64"),
- ("riscv64gc", "riscv64"),
-diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs
-index 5051b296..286c2fb7 100644
---- a/vendor/cc/src/lib.rs
-+++ b/vendor/cc/src/lib.rs
-@@ -2409,6 +2409,7 @@ impl Build {
- "powerpc-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
- "powerpc-unknown-linux-gnuspe" => Some("powerpc-linux-gnuspe"),
- "powerpc-unknown-netbsd" => Some("powerpc--netbsd"),
-+ "powerpcle-unknown-linux-gnu" => Some("powerpcle-linux-gnu"),
- "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
- "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"),
- "riscv32i-unknown-none-elf" => self.find_working_gnu_prefix(&[
-diff --git a/vendor/rustc-ap-rustc_target/src/spec/mod.rs b/vendor/rustc-ap-rustc_target/src/spec/mod.rs
-index 2af46693..986d84e0 100644
---- a/vendor/rustc-ap-rustc_target/src/spec/mod.rs
-+++ b/vendor/rustc-ap-rustc_target/src/spec/mod.rs
-@@ -716,6 +716,8 @@ supported_targets! {
- ("powerpc-unknown-linux-gnu", powerpc_unknown_linux_gnu),
- ("powerpc-unknown-linux-gnuspe", powerpc_unknown_linux_gnuspe),
- ("powerpc-unknown-linux-musl", powerpc_unknown_linux_musl),
-+ ("powerpcle-unknown-linux-gnu", powerpcle_unknown_linux_gnu),
-+ ("powerpcle-unknown-linux-musl", powerpcle_unknown_linux_musl),
- ("powerpc64-unknown-linux-gnu", powerpc64_unknown_linux_gnu),
- ("powerpc64-unknown-linux-musl", powerpc64_unknown_linux_musl),
- ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu),
-diff --git a/vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs b/vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
-new file mode 100644
-index 00000000..780c20a3
---- /dev/null
-+++ b/vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
-@@ -0,0 +1,15 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::linux_gnu_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpcle-unknown-linux-gnu".to_string(),
-+ pointer_width: 32,
-+ data_layout: "e-m:e-p:32:32-i64:64-n32".to_string(),
-+ arch: "powerpc".to_string(),
-+ options: TargetOptions { mcount: "_mcount".to_string(), ..base },
-+ }
-+}
-diff --git a/vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_musl.rs b/vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-new file mode 100644
-index 00000000..9b848ccf
---- /dev/null
-+++ b/vendor/rustc-ap-rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-@@ -0,0 +1,15 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::linux_musl_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpcle-unknown-linux-musl".to_string(),
-+ pointer_width: 32,
-+ data_layout: "e-m:e-p:32:32-i64:64-n32".to_string(),
-+ arch: "powerpc".to_string(),
-+ options: TargetOptions { mcount: "_mcount".to_string(), ..base },
-+ }
-+}
-diff --git a/vendor/target-lexicon/src/targets.rs b/vendor/target-lexicon/src/targets.rs
-index 87c237aa..dc694010 100644
---- a/vendor/target-lexicon/src/targets.rs
-+++ b/vendor/target-lexicon/src/targets.rs
-@@ -26,6 +26,7 @@ pub enum Architecture {
- Msp430,
- Nvptx64,
- Powerpc,
-+ Powerpcle,
- Powerpc64,
- Powerpc64le,
- Riscv32(Riscv32Architecture),
-@@ -517,6 +518,7 @@ impl Architecture {
- | Mips64(Mips64Architecture::Mipsisa64r6el)
- | Msp430
- | Nvptx64
-+ | Powerpcle
- | Powerpc64le
- | Riscv32(_)
- | Riscv64(_)
-@@ -553,6 +555,7 @@ impl Architecture {
- | Sparc
- | Wasm32
- | Mips32(_)
-+ | Powerpcle
- | Powerpc => Ok(PointerWidth::U32),
- AmdGcn
- | Powerpc64le
-@@ -737,6 +740,7 @@ impl fmt::Display for Architecture {
- Msp430 => f.write_str("msp430"),
- Nvptx64 => f.write_str("nvptx64"),
- Powerpc => f.write_str("powerpc"),
-+ Powerpcle => f.write_str("powerpcle"),
- Powerpc64 => f.write_str("powerpc64"),
- Powerpc64le => f.write_str("powerpc64le"),
- Riscv32(riscv32) => riscv32.fmt(f),
-@@ -913,6 +917,7 @@ impl FromStr for Architecture {
- "msp430" => Msp430,
- "nvptx64" => Nvptx64,
- "powerpc" => Powerpc,
-+ "powerpcle" => Powerpcle,
- "powerpc64" => Powerpc64,
- "powerpc64le" => Powerpc64le,
- "s390x" => S390x,
-@@ -1380,6 +1385,8 @@ mod tests {
- "powerpc-unknown-netbsd",
- "powerpc-wrs-vxworks",
- "powerpc-wrs-vxworks-spe",
-+ "powerpcle-unknown-linux-gnu",
-+ "powerpcle-unknown-linux-musl",
- "powerpc64-unknown-freebsd",
- "powerpc64-unknown-linux-gnu",
- "powerpc64-unknown-linux-musl",
-diff --git a/vendor/tikv-jemallocator/benches/roundtrip.rs b/vendor/tikv-jemallocator/benches/roundtrip.rs
-index 40b8005f..bc4df023 100644
---- a/vendor/tikv-jemallocator/benches/roundtrip.rs
-+++ b/vendor/tikv-jemallocator/benches/roundtrip.rs
-@@ -22,7 +22,8 @@ static A: Jemalloc = Jemalloc;
- target_arch = "arm",
- target_arch = "mips",
- target_arch = "mipsel",
-- target_arch = "powerpc"
-+ target_arch = "powerpc",
-+ target_arch = "powerpcle",
- )))]
- const MIN_ALIGN: usize = 8;
- #[cfg(all(any(
-diff --git a/vendor/tikv-jemallocator/src/lib.rs b/vendor/tikv-jemallocator/src/lib.rs
-index 9a489b62..1ed12b26 100644
---- a/vendor/tikv-jemallocator/src/lib.rs
-+++ b/vendor/tikv-jemallocator/src/lib.rs
-@@ -44,7 +44,8 @@ use libc::{c_int, c_void};
- target_arch = "arm",
- target_arch = "mips",
- target_arch = "mipsel",
-- target_arch = "powerpc"
-+ target_arch = "powerpc",
-+ target_arch = "powerpcle"
- )))]
- const ALIGNOF_MAX_ALIGN_T: usize = 8;
- #[cfg(all(any(
---
-2.32.0
-
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 49de23df8acd..ce5a54f0ac2b 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.59.0
+version=1.60.0
revision=1
wrksrc="rustc-${version}-src"
hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=a7c8eeaee85bfcef84c96b02b3171d1e6540d15179ff83dddd9eafba185f85f9
+checksum=20ca826d1cf674daf8e22c4f8c4b9743af07973211c839b85839742314c838b7
lib32disabled=yes
make_check=no # CBA for now
@@ -61,7 +61,6 @@ post_patch() {
_clear_vendor_checksums libc
_clear_vendor_checksums typenum
_clear_vendor_checksums cc
- _clear_vendor_checksums rustc-ap-rustc_target
_clear_vendor_checksums target-lexicon
_clear_vendor_checksums tikv-jemallocator
}
From 5a4c4b0e715afe3144de91843d846e62e1e79c6c Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 17 Apr 2022 01:32:25 +0530
Subject: [PATCH 7/8] cargo-bootstrap: update to 1.60.0
---
srcpkgs/cargo-bootstrap/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index bb7490566a4f..e906da892bb5 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.59.0
+version=1.60.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="q66 <daniel@octaforge.org>"
@@ -25,25 +25,25 @@ distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
case "$XBPS_TARGET_MACHINE" in
i686)
- checksum="4f282b8a4dadf53ba3f8784cefe0c2be908179ba81b7b29a0db4a11b6a3f8849"
+ checksum="8490d9c772120f25ccd443cf11f7ecc2837d176737fe5399014c96802d279d47"
;;
x86_64)
- checksum="f56ebfb333ea46e4429377bf4b16a2ec889d61640a41c3093577cdd8f3c80b96"
+ checksum="48edb2eb51d7c56ef9a3130f0b331e83f139559161f6f93b9588d28cf72610f3"
;;
x86_64-musl)
- checksum="95f2727f22f40d7a294f08d24dc7b5f4fb4fe3991854becceffa75bf8f049745"
+ checksum="38268edfebb190192f895134c73824ac9b017fa937510be4b35be17364ad05e4"
;;
ppc64le)
- checksum="fdab44481286db3ea8f4b6d409e648355009ef458188352d5e2c5799f7614fbd"
+ checksum="ed7a75ec1af8ce187ce2fecc8ddb38b1979416eeb832c319526c85458a0e4564"
;;
ppc64le-musl)
- checksum="f2b7e87c5f7fbab96c008374049ba1019c3503cf3c5b7742e536375c2a11f584"
+ checksum="badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb"
;;
ppc64)
- checksum="8535bc99aa88daa8f7fc001a9a7588f1d024a8d2aa38462532745d5327233cae"
+ checksum="e48d98130f79858a3d969d1af95314ae46ba91a3cc20dcbd408412368643bd45"
;;
ppc)
- checksum="377942d80eade23684a2dc4fa89782e782ae7f90038b7d56bf1bb48afc822c8f"
+ checksum="04baf8303fab197e3643270fd93eb42eb9e7f44fced98406fa5a43373684f0db"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_MACHINE}";;
esac
From 6953b2db80b202c1e59464fba502e344974e3fb7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 17 Apr 2022 01:34:42 +0530
Subject: [PATCH 8/8] cargo: update to 1.60.0
---
srcpkgs/cargo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index d65a3e51c172..d3d55f4ccef1 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,6 +1,6 @@
# Template file for 'cargo'
pkgname=cargo
-version=1.59.0
+version=1.60.0
revision=1
wrksrc="cargo-rust-${version}"
build_helper=rust
@@ -12,9 +12,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://crates.io/"
distfiles="https://github.com/rust-lang/cargo/archive/rust-${version}.tar.gz
- https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.7.tar.gz"
-checksum="e3bcc26be1a07ecd6eaa07a46a6343558924c39db862ffe1adffca90feb9371f
- 560fa9a67019d3b3db7c4b887cbc35cc8e87a436b04d5943d5cdf844b4275229"
+ https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.8.tar.gz"
+checksum="56e3af687923ca96f3e2cd9a416bc03c2463f1a04fcf43cba90764410b906294
+ 52c451910203cd9002cc4b85cff95f45c6ba245392801e80d7898ca5c3c3ab29"
replaces="cargo-tree>=0"
build_options="static bindist"
next prev parent reply other threads:[~2022-04-17 3:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 19:49 [PR PATCH] [DRAFT][ci skip] " subnut
2022-03-22 2:23 ` [PR PATCH] [Updated] " subnut
2022-03-22 2:52 ` subnut
2022-03-22 2:53 ` subnut
2022-03-22 3:36 ` [PR PATCH] [Updated] " subnut
2022-03-22 3:44 ` subnut
2022-03-22 4:17 ` subnut
2022-03-22 4:18 ` subnut
2022-03-22 4:19 ` subnut
2022-03-22 4:33 ` [PR PATCH] [Updated] [DRAFT] " subnut
2022-03-22 4:34 ` subnut
2022-03-22 6:56 ` subnut
2022-03-22 7:09 ` subnut
2022-03-22 7:10 ` subnut
2022-03-22 11:59 ` [PR PATCH] [Updated] " subnut
2022-03-22 12:01 ` subnut
2022-03-22 13:26 ` subnut
2022-03-22 15:06 ` subnut
2022-03-23 3:54 ` subnut
2022-03-28 3:38 ` subnut
2022-04-16 14:53 ` subnut
2022-04-16 17:25 ` q66
2022-04-16 19:25 ` [PR PATCH] [Updated] " subnut
2022-04-16 20:04 ` subnut
2022-04-17 3:10 ` subnut [this message]
2022-04-17 3:35 ` subnut
2022-04-17 17:07 ` subnut
2022-04-17 17:07 ` [PR PATCH] [Closed]: " subnut
2022-04-17 17:08 ` subnut
2022-04-28 12:19 ` Update Rust toolchain to 1.60.0 tranzystorek-io
2022-05-19 23:01 ` cinerea0
2022-05-20 5:39 ` subnut
2022-05-20 5:39 ` [PR PATCH] [Closed]: " subnut
2022-05-20 5:39 ` subnut
2022-05-20 6:52 ` tranzystorek-io
2022-05-20 9:38 ` subnut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220417031017.r2SrjiPjBFOwRpu86PiPBRHox-2wCS5l8AwTXw_WuRw@z \
--to=subnut@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).