From 869858c75410582e00dc30b485abb70ed6e1d4d1 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 8 Feb 2024 15:30:13 +0100 Subject: [PATCH 1/4] rust-bootstrap: update to 1.76.0 --- 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 8ba0300995587..6a192e750e59f 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.75.0 +version=1.76.0 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=" - a39aed533c63b4da6c0d9f30e76d7290ed5b3be2e66bde43d02764d7b50d382f - 42c0aba08ddcad191c84adcb5b6479b4599b9e4656e4e2b6d3ed5b46fa4a04fb" + e52ff92c605284b049e88912343a0f1c9c4cef7cc4a501d4e8f1ab9e4d9b1d7e + 78fb0859beb4f18af7227af3f09f0218169ca38c7751865e40d78d697ca190fc" ;; 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=" - 2824ba4045acdddfa436da4f0bb72807b64a089aa2e7c9a66ca1a3a571114ce7 - 136b132199f7bbda2aa0bbff6d1e6ae7d5fca2994a2f2a432a5e99de224b6314" + 9fadfcf71bc6a0ddfd026b9624163faf1c5689dd4a1f7cc1f857167ade4aa6eb + e41150b52d923a3bbe166c4ecc5719f56576274b0d034d764768aee279ae2063" ;; 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=" - 692c9e78bca24010f4eb8d8a02febd8f55463ef8aa49975a780c4124f10abe5e - 3728f2d2266b5c87fe2a7ae9c46fc43d06f8c855d7d0f141de6bcd24b43ae919" + 3669762d7ee90d06bc3b532e15fc29e7918b40b85c93ea314b98d6cad18f435b + 995bda2aeff09ecbda9a1892a6c47beb087e99c9be924dc8fa6416f6813f4edc" ;; # placeholders for user-supplied distfiles ppc64le) From 2740e3b1f2db5ac8adbb235a40d771cbc524d675 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 8 Feb 2024 15:30:41 +0100 Subject: [PATCH 2/4] cargo-bootstrap: update to 1.76.0 --- 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 3728f9000ccd9..0afa19d2e23de 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.75.0 +version=1.76.0 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="ab652e4755def10f37c245245643d60f56cb28a7dcd2defb8a1d560eafbf08f1" + checksum="ffa9b2b65a3bd6298ffd5a2defd6ac5fa42d1a0dcefdea50b92ddf8d162db19c" ;; x86_64) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz" - checksum="6ac164e7da969a1d524f747f22792e9aa08bc7446f058314445a4f3c1d31a6bd" + checksum="30ec0ad9fca443ec12c544f9ce448dacdde411a45b9042961938b650e918ccfb" ;; x86_64-musl) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz" - checksum="202591b3efe015399329c3b1664bb832f45a76e3ec90f16ba85641e8b1688a7e" + checksum="b18032e92bbd69a9ed9036393a3d5168d3071e2d47c74cb9e2fe1737b7d106b6" ;; # placeholders for user-supplied distfiles ppc64le) From 58718a7a659fbde98a20441585cae83f656d868d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 8 Feb 2024 15:31:23 +0100 Subject: [PATCH 3/4] rust: update to 1.76.0 --- ...dlib-and-musl_root-from-musl-targets.patch | 52 +++++++++++-------- ...ng-native-sysroot-to-use-for-linkage.patch | 24 ++++----- srcpkgs/rust/template | 10 ++-- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch index 7b7adf3a73f6d..fd039c031bf3f 100644 --- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch +++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch @@ -61,10 +61,10 @@ index 53f710b8f..2a4eec15f 100644 new(&[ (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]), diff --git a/config.example.toml b/config.example.toml -index e5df28a49..31c682ab9 100644 +index a7d4df545..feaa0f861 100644 --- a/config.example.toml +++ b/config.example.toml -@@ -589,14 +589,6 @@ change-id = 116881 +@@ -586,14 +586,6 @@ # behavior -- this may lead to miscompilations or other bugs. #description = "" @@ -119,7 +119,7 @@ index 544a42d9a..8bd3fc755 100755 "riscv32gc-unknown-linux-musl install directory") v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root", diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs -index 7021a9543..b314bbb8d 100644 +index df4d1a43d..b34309a27 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs @@ -307,39 +307,7 @@ fn copy_self_contained_objects( @@ -180,10 +180,10 @@ index 7021a9543..b314bbb8d 100644 if let Some(p) = builder.wasi_root(target) { let root = format!( diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs -index 0a9175aa3..029f32912 100644 +index f1e1b89d9..e706b9d65 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs -@@ -270,7 +270,6 @@ pub struct Config { +@@ -308,7 +308,6 @@ pub struct Config { pub missing_tools: bool, // Fallback musl-root for all targets @@ -191,7 +191,7 @@ index 0a9175aa3..029f32912 100644 pub prefix: Option, pub sysconfdir: Option, pub datadir: Option, -@@ -528,8 +527,6 @@ pub struct Target { +@@ -574,8 +573,6 @@ pub struct Target { pub profiler: Option, pub rpath: Option, pub crt_static: Option, @@ -200,15 +200,15 @@ index 0a9175aa3..029f32912 100644 pub wasi_root: Option, pub qemu_rootfs: Option, pub no_std: bool, -@@ -998,7 +995,6 @@ define_config! { +@@ -1080,7 +1077,6 @@ define_config! { default_linker: Option = "default-linker", channel: Option = "channel", description: Option = "description", - musl_root: Option = "musl-root", rpath: Option = "rpath", - verbose_tests: Option = "verbose-tests", - optimize_tests: Option = "optimize-tests", -@@ -1046,8 +1042,6 @@ define_config! { + strip: Option = "strip", + stack_protector: Option = "stack-protector", +@@ -1131,8 +1127,6 @@ define_config! { profiler: Option = "profiler", rpath: Option = "rpath", crt_static: Option = "crt-static", @@ -217,15 +217,23 @@ index 0a9175aa3..029f32912 100644 wasi_root: Option = "wasi-root", qemu_rootfs: Option = "qemu-rootfs", no_std: Option = "no-std", -@@ -1437,7 +1431,6 @@ impl Config { - .parallel_compiler - .unwrap_or(config.channel == "dev" || config.channel == "nightly"); - config.rustc_default_linker = rust.default_linker; -- config.musl_root = rust.musl_root.map(PathBuf::from); - config.save_toolstates = rust.save_toolstates.map(PathBuf::from); +@@ -1532,7 +1526,6 @@ impl Config { + default_linker, + channel, + description, +- musl_root, + rpath, + verbose_tests, + optimize_tests, +@@ -1634,7 +1627,6 @@ impl Config { + config.rustc_parallel = + parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly"); + config.rustc_default_linker = default_linker; +- config.musl_root = musl_root.map(PathBuf::from); + config.save_toolstates = save_toolstates.map(PathBuf::from); set( &mut config.deny_warnings, -@@ -1606,8 +1599,6 @@ impl Config { +@@ -1827,8 +1819,6 @@ impl Config { target.ranlib = cfg.ranlib.map(PathBuf::from); target.linker = cfg.linker.map(PathBuf::from); target.crt_static = cfg.crt_static; @@ -235,7 +243,7 @@ index 0a9175aa3..029f32912 100644 target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from); target.sanitizers = cfg.sanitizers; diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs -index eec3be66a..a2d1cb5df 100644 +index 9101d94ea..df72d6f9a 100644 --- a/src/bootstrap/src/core/sanity.rs +++ b/src/bootstrap/src/core/sanity.rs @@ -11,7 +11,6 @@ @@ -272,14 +280,14 @@ index eec3be66a..a2d1cb5df 100644 - } - } - - if need_cmake && target.contains("msvc") { + if need_cmake && target.is_msvc() { // There are three builds of cmake on windows: MSVC, MinGW, and // Cygwin. The Cygwin build does not have generators for Visual diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs -index 33b8f1a7c..4ba88439b 100644 +index 871318de5..b3f1eff91 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs -@@ -1306,25 +1306,6 @@ impl Build { +@@ -1290,25 +1290,6 @@ impl Build { } } @@ -306,7 +314,7 @@ index 33b8f1a7c..4ba88439b 100644 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/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs -index 52b36ce75..a67d05075 100644 +index fb5b9d8c8..c6c9368a0 100644 --- a/src/bootstrap/src/utils/cc_detect.rs +++ b/src/bootstrap/src/utils/cc_detect.rs @@ -201,30 +201,6 @@ fn default_compiler( diff --git a/srcpkgs/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch b/srcpkgs/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch index 0ed9659474fe2..37ca0845b697d 100644 --- a/srcpkgs/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch +++ b/srcpkgs/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch @@ -7,25 +7,25 @@ This allows us to get around the linker attempting to use incompatible libs. diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs -index cd276674d..a67a0cbcc 100644 +index e18096443..b48742ae4 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs -@@ -1687,6 +1687,10 @@ impl<'a> Builder<'a> { - } +@@ -1706,6 +1706,10 @@ impl<'a> Builder<'a> { + hostflags.arg(&arg); } + if let Some(sysroot) = self.native_sysroot(target) { + rustflags.arg(&format!("-Clink-args=--sysroot={}", sysroot.display())); + } + - if let Some(host_linker) = self.linker(compiler.host) { - hostflags.arg(format!("-Clinker={}", host_linker.display())); - } + if let Some(target_linker) = self.linker(target) { + let target = crate::envify(&target.triple); + cargo.env(&format!("CARGO_TARGET_{target}_LINKER"), target_linker); diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs -index 0a9175aa3..d6f31b0cd 100644 +index f1e1b89d9..30e61161d 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs -@@ -524,6 +524,7 @@ pub struct Target { +@@ -570,6 +570,7 @@ pub struct Target { pub ranlib: Option, pub default_linker: Option, pub linker: Option, @@ -33,7 +33,7 @@ index 0a9175aa3..d6f31b0cd 100644 pub sanitizers: Option, pub profiler: Option, pub rpath: Option, -@@ -1038,6 +1039,7 @@ define_config! { +@@ -1123,6 +1124,7 @@ define_config! { ranlib: Option = "ranlib", default_linker: Option = "default-linker", linker: Option = "linker", @@ -41,7 +41,7 @@ index 0a9175aa3..d6f31b0cd 100644 llvm_config: Option = "llvm-config", llvm_has_rust_patches: Option = "llvm-has-rust-patches", llvm_filecheck: Option = "llvm-filecheck", -@@ -1605,6 +1607,7 @@ impl Config { +@@ -1826,6 +1828,7 @@ impl Config { target.ar = cfg.ar.map(PathBuf::from); target.ranlib = cfg.ranlib.map(PathBuf::from); target.linker = cfg.linker.map(PathBuf::from); @@ -50,10 +50,10 @@ index 0a9175aa3..d6f31b0cd 100644 target.musl_root = cfg.musl_root.map(PathBuf::from); target.musl_libdir = cfg.musl_libdir.map(PathBuf::from); diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs -index 33b8f1a7c..edfafa173 100644 +index 871318de5..96abbe721 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs -@@ -1305,6 +1305,10 @@ impl Build { +@@ -1289,6 +1289,10 @@ impl Build { self.config.target_config.get(&target).and_then(|t| t.crt_static) } } diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index d33e713857ad3..2ce75af7b3a9c 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -8,17 +8,17 @@ # uploaded to https://repo-default.voidlinux.org/distfiles/ # pkgname=rust -version=1.75.0 -revision=2 +version=1.76.0 +revision=1 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap" -makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15" +makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel" depends="rust-std gcc" short_desc="Safe, concurrent, practical systems language" 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=5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088 +checksum=9e5cff033a7f0d2266818982ad90e4d3e4ef8f8ee1715776c6e25073a136c021 lib32disabled=yes make_check=no # CBA for now python_version=3 # needed for python files in rust-src @@ -34,7 +34,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" rust llvm15" + hostmakedepends+=" rust llvm17-devel" # These are required for building the buildhost's stage0/1 hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" else From 4bee4a9ebfa16db907a77127371e05fc6308ee80 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 8 Feb 2024 15:31:40 +0100 Subject: [PATCH 4/4] cargo: update to 1.76.0 --- srcpkgs/cargo/patches/downgrade-git2.patch | 20 ++++++++++---------- srcpkgs/cargo/template | 9 ++++++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch index 89002151bf348..c35a90d0ce555 100644 --- a/srcpkgs/cargo/patches/downgrade-git2.patch +++ b/srcpkgs/cargo/patches/downgrade-git2.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.lock b/Cargo.lock -index a2d339b..6cdf579 100644 +index 36cf880..72aca65 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -995,11 +995,11 @@ dependencies = [ +@@ -1025,11 +1025,11 @@ dependencies = [ [[package]] name = "git2" @@ -12,12 +12,12 @@ index a2d339b..6cdf579 100644 -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ -- "bitflags 2.4.0", +- "bitflags 2.4.1", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", -@@ -1010,9 +1010,9 @@ dependencies = [ +@@ -1040,9 +1040,9 @@ dependencies = [ [[package]] name = "git2-curl" @@ -29,7 +29,7 @@ index a2d339b..6cdf579 100644 dependencies = [ "curl", "git2", -@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +@@ -2065,9 +2065,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -42,24 +42,24 @@ index a2d339b..6cdf579 100644 "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml -index 3fb36b4..ed19d0d 100644 +index c07b004..68c45a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,8 +40,8 @@ curl = "0.4.44" - curl-sys = "0.4.68" + curl-sys = "0.4.70" filetime = "0.2.22" flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } -git2 = "0.18.1" -git2-curl = "0.19.0" +git2 = "0.17.2" +git2-curl = "0.18.0" - gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } + gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } glob = "0.3.1" -@@ -58,7 +58,7 @@ itertools = "0.11.0" +@@ -58,7 +58,7 @@ itertools = "0.12.0" jobserver = "0.1.27" lazycell = "1.3.0" - libc = "0.2.149" + libc = "0.2.150" -libgit2-sys = "0.16.1" +libgit2-sys = "0.15.2" libloading = "0.8.1" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 99195fe824eae..4ca4a39956037 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.75.0 +version=1.76.0 revision=1 -_cargo_revision=0.76.0 +_cargo_revision=0.77.0 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel" makedepends="rust libcurl-devel openssl-devel" @@ -12,7 +12,7 @@ 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=52d57889715cdfe0070b13f6d4dbfc4affdafc763483269e78b6ebd7166fdb83 +checksum=1c33e2feb197f848f082fdc074162328e231c2f68394e0e1d2dbbbf79c9fc3ec replaces="cargo-tree>=0" build_options="static bindist" @@ -29,6 +29,9 @@ fi do_build() { local cargs + # breaks requested building sqlite in bundled mode + unset LIBSQLITE3_SYS_USE_PKG_CONFIG + if [ -n "$_build_static" ]; then unset LIBSSH2_SYS_USE_PKG_CONFIG export OPENSSL_STATIC=1