Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [DRAFT][ci skip] Update Rust toolchain to 1.59.0
@ 2022-03-21 19:49 subnut
  2022-03-22  2:23 ` [PR PATCH] [Updated] " subnut
                   ` (34 more replies)
  0 siblings, 35 replies; 36+ messages in thread
From: subnut @ 2022-03-21 19:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

There is a new 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

[DRAFT][ci skip] Update Rust toolchain to 1.59.0
DRAFT

<!-- Uncomment relevant sections and delete options which are not applicable -->
<!--
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
-->
<!--
#### 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, (ARCH-LIBC)
- 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: 15962 bytes --]

From a3ba395cc9983a4750f338050a3f80bd6789a4f0 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 22 Mar 2022 00:23:17 +0530
Subject: [PATCH 1/2] 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..3c6ed45163c7 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"
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f"
 		;;
 	ppc64le-musl)
 		checksum="
-		 6b48e521ba8a070a7b992595e82c5a164cc01c93bbd9a7b3d4db362f4b060df8
-		 d7876e817fc95df2e81858fc9ddb95b10fb83b413277ea6dbdfa9a80fa0d990e"
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f"
 		;;
 	ppc64)
 		checksum="
-		 2ea5b66d2cd8b9c251590fd5bd3e23cedec658b61f541e2824ce3fdcda263982
-		 e9c1394771b1b24241d8938ad75c4a6ed8bfa043522c74767b3528f2289095c0"
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f"
 		;;
 	ppc)
 		checksum="
-		 a1d7611b2d39224ba9a915009ae2a6639def42767370f50effd57770b3eb2150
-		 bc117ce5f0c81d2e14ea2d1832c0e908b1153caf49f295a9d28af2128f5fae44"
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f
+		 abda08beb3411ec8f14ab872aa9859dc419e5f75c312221a62d655ff5401876f"
 		;;
 	*) broken="rust bootstrap binaries unavailable for ${XBPS_MACHINE}";;
 esac

From da09ec63702918207507024d9e2b55f4d5d1c81a 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/2] 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                         | 10 +--
 6 files changed, 48 insertions(+), 83 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..a0a543523cfb 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
 
@@ -218,12 +218,6 @@ do_install() {
 	# symlinks instead of copies
 	mv *.so rustlib/${RUST_TARGET}/lib
 	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() {

^ permalink raw reply	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2022-05-20  9:38 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-21 19:49 [PR PATCH] [DRAFT][ci skip] Update Rust toolchain to 1.59.0 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
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

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).