community/rust: upgrade to 1.42.0

3 files changed, 10 insertions, 115 deletions

diff --git a/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
index d32841103a..61a2d28e2c 100644
--- a/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+++ b/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
@@ -25,13 +25,13 @@ diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
 index f24d957..28828e5 100644
 --- a/src/libunwind/build.rs
 +++ b/src/libunwind/build.rs
-@@ -5,15 +5,11 @@ fn main() {
+@@ -5,15 +5,12 @@
      let target = env::var("TARGET").expect("TARGET was not set");
  
-     if cfg!(feature = "llvm-libunwind") &&
--        ((target.contains("linux") && !target.contains("musl")) ||
--         target.contains("fuchsia")) {
-+        (target.contains("linux") || target.contains("fuchsia")) {
+     if cfg!(feature = "llvm-libunwind")
+-        && ((target.contains("linux") && !target.contains("musl")) || target.contains("fuchsia"))
++        && (target.contains("linux") || target.contains("fuchsia"))
+     {
          // Build the unwinding from libunwind C/C++ source code.
          llvm_libunwind::compile();
      } else if target.contains("linux") {
@@ -43,7 +43,7 @@ index f24d957..28828e5 100644
              println!("cargo:rustc-link-lib=gcc_s");
          }
      } else if target.contains("freebsd") {
-@@ -99,15 +95,6 @@ mod llvm_libunwind {
+@@ -105,15 +102,6 @@
              cfg.file(root.join("src").join(src));
          }
  
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 50c87a945b..ef38f37c55 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -4,9 +4,9 @@
 # Contributor: Jeizsm <jeizsm@gmail.com>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=rust
-pkgver=1.41.1
+pkgver=1.42.0
 _llvmver=9
-_bootver=1.41.0
+_bootver=1.41.1
 pkgrel=0
 pkgdesc="The Rust Programming Language"
 url="https://www.rust-lang.org"
@@ -45,9 +45,6 @@ provides="rust-bootstrap=$pkgver-r$pkgrel"
 # Disable tests for now, while we use foreign triplets
 options="!archcheck !check"
 
-# https://github.com/rust-lang/rust/issues/68794
-[ "$CARCH" = "x86" ] && options="$options textrels"
-
 subpackages="
 	$pkgname-dbg
 	$pkgname-stdlib
@@ -67,7 +64,6 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz
 	static-pie.patch
 	need-rpath.patch
 	need-ssp_nonshared.patch
-	minimize-rpath.patch
 	alpine-move-py-scripts-to-share.patch
 	alpine-target.patch
 	install-template-shebang.patch
@@ -307,17 +303,16 @@ _mv() {
 	mv "$@"
 }
 
-sha512sums="b5fba98a3e1b50ab91ad093cec4347ba85f46aa7e7a0da18d39f794e43eebb56699292832051f0efcd97a8651c35c11a7079146fb2c909ebeab2305b79bb4587  rustc-1.41.1-src.tar.gz
+sha512sums="00359778ba886393e9792763ebd2754ee0b0db535a246ce9dcbbedd63b6eb414e321b552c88d4347ca355b8066492ef657aa3ceca2bcf00dfd80e1a92fac24b0  rustc-1.42.0-src.tar.gz
 8d52048070e9a158810f5ef71eae07a3b107b60986375a593c3509f4c47f8e2f7fcdff8bc558c03c46127dbf66c4077dd7b5b422a83f2c49fb5d52ecfae5697e  musl-fix-static-linking.patch
 41fd9e8a8dd99074d95d664e65f92dba644b8ef9fa37b9a1d781a01fe49eaa254c430f0f277622dc4f8203aad2d129a045fdf1679a0da526d549fac60654be26  musl-fix-linux_musl_base.patch
 97e81c57af93df550577f41d795185a9eb0c37528776c250076cc57f06c87e81139eb71cd6b6a4730528511821ae50c304d7deb534d6422cd08bb44193ae605d  static-pie.patch
 d4659b56dbf1218da98b995a0a89a8cfd069dd94b3e9aef4aee987484d96fc8b92f6d695ea4123eff26711961f2db2f7324bf5b4043f41722cd89581aac97f1c  need-rpath.patch
 5bb8b60fee2540bfb3df0c0759d540eb5c29f861d8ed4640768fd8f5bc28fb781e2aafe37002dfc0fb0fc4c5c50be7e35981a0814b2a175368397463d0411910  need-ssp_nonshared.patch
-e90e544d2413ae79c553bb1d82eac9b41eb2a7c7ffb7cb28dc3573418bd453c27dcc48f38ce4b8e33bb994b5481db70303c707231b7d4f7fde561bebf0838f21  minimize-rpath.patch
 35e0619672843d9dd41df4a086404a59b57c12fa014e42d06102bc3856a96ed021e716f9d581ec5c89444acbaedd3edcd2b8a85576df3bb4451c0edde3afbba5  alpine-move-py-scripts-to-share.patch
 080c3c1af15936c3795724d3cf0f60798ef470bce898e43b6757843bf56f6d46de3dd5b9ea3b116b2011b40373cf8daf17abc94cfff4bdb6221bd431aa0844fd  alpine-target.patch
 7d59258d4462eba0207739a5c0c8baf1f19d9a396e5547bb4d59d700eb94d50ba6add2e523f3e94e29e993821018594625ea4ac86304fb58f7f8c82622a26ab0  install-template-shebang.patch
 c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125  check-rustc
 2a91c0d149f19a2268b2db8e375e0c10820529f588161d8d8e68900d929235d9b1cb4f0d64539c1e20ecca3948b4715f2d9d3d16a2754373d56b4b5808bed6bd  link-musl-dynamically.patch
 795194976763326c5e4a9eefc8b651b6d5fb533d2d000631ed48a92bafac90e9ca33b8d662e6c53ef109ea1a90c69def715d7d7154e3f9fb9035a58a313a7db3  musl-dont-use-crt-static.patch
-f15c8e6a4c8ad33ee5874580ed76463e2a7359e9b4a8651eb974ea5354c3f992fd2ce1d04661ee8cff2105b25967428894ecdd144a6a45f09c7e1952b2f3731c  0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
+9cb9542a13cc356b9f67be02cbe43cfd8d95c79fd561ed5ff5fe1741219e7571904046312be7ab3bda0944ce83bf10c5ddd3e32f19a16334ee445031128354da  0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
diff --git a/community/rust/minimize-rpath.patch b/community/rust/minimize-rpath.patch
deleted file mode 100644
index ccc9ccae59..0000000000
--- a/community/rust/minimize-rpath.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Shiz <hi@shiz.me>
-Date: Thu, 20 Aug 2017 01:44:12 +0200
-Subject: [PATCH] Minimize generated RPATH in end products
-
-By default, RPATH generation adds both the install prefix and the generated
-relative path to the install prefix. This is unnecessary, so we add the install
-prefix to a list of absolute paths to omit in the relative path generation,
-and skip it there.
-
---- a/src/librustc_codegen_ssa/back/rpath.rs
-+++ b/src/librustc_codegen_ssa/back/rpath.rs
-@@ -59,13 +59,14 @@
-         debug!("    {:?}", libpath.display());
-     }
- 
-+    // The backup rpath is the global library location.
-+    // We also omit this path from the relative rpaths.
-+    let fallback_rpaths = vec![get_install_prefix_rpath(config)];
-+
-     // Use relative paths to the libraries. Binaries can be moved
-     // as long as they maintain the relative relationship to the
-     // crates they depend on.
--    let rel_rpaths = get_rpaths_relative_to_output(config, libs);
--
--    // And a final backup rpath to the global library location.
--    let fallback_rpaths = vec![get_install_prefix_rpath(config)];
-+    let rel_rpaths = get_rpaths_relative_to_output(config, libs, &fallback_rpaths);
- 
-     fn log_rpaths(desc: &str, rpaths: &[String]) {
-         debug!("{} rpaths:", desc);
-@@ -87,11 +88,13 @@
- }
- 
- fn get_rpaths_relative_to_output(config: &mut RPathConfig<'_>,
--                                 libs: &[PathBuf]) -> Vec<String> {
--    libs.iter().map(|a| get_rpath_relative_to_output(config, a)).collect()
-+                                 libs: &[PathBuf],
-+                                 omit: &Vec<String>) -> Vec<String> {
-+    libs.iter().filter_map(|a| get_rpath_relative_to_output(config, a, omit)).collect()
- }
- 
--fn get_rpath_relative_to_output(config: &mut RPathConfig<'_>, lib: &Path) -> String {
-+fn get_rpath_relative_to_output(config: &mut RPathConfig<'_>, lib: &Path,
-+                                omit: &Vec<String>) -> Option<String> {
-     // Mac doesn't appear to support $ORIGIN
-     let prefix = if config.is_like_osx {
-         "@loader_path"
-@@ -105,10 +108,16 @@
-     let mut output = cwd.join(&config.out_filename);
-     output.pop(); // strip filename
-     let output = fs::canonicalize(&output).unwrap_or(output);
--    let relative = path_relative_from(&lib, &output).unwrap_or_else(||
--        panic!("couldn't create relative path from {:?} to {:?}", output, lib));
--    // FIXME (#9639): This needs to handle non-utf8 paths
--    format!("{}/{}", prefix, relative.to_str().expect("non-utf8 component in path"))
-+    let libpath = lib.to_str().expect("non-utf8 component in path").to_string();
-+    if omit.contains(&libpath) {
-+        None
-+    } else {
-+        let relative = path_relative_from(&lib, &output)
-+            .expect(&format!("couldn't create relative path from {:?} to {:?}", output, lib));
-+        // FIXME (#9639): This needs to handle non-utf8 paths
-+        Some(format!("{}/{}", prefix,
-+                     relative.to_str().expect("non-utf8 component in path")))
-+    }
- }
- 
- // This routine is adapted from the *old* Path's `path_relative_from`
---- a/src/librustc_codegen_ssa/back/rpath/tests.rs
-+++ b/src/librustc_codegen_ssa/back/rpath/tests.rs
-@@ -50,6 +50,8 @@
- 
- #[test]
- fn test_rpath_relative() {
-+    let omit = Vec::new();
-+
-     if cfg!(target_os = "macos") {
-         let config = &mut RPathConfig {
-             used_crates: Vec::new(),
-@@ -60,7 +62,8 @@
-             get_install_prefix_lib_path: &mut || panic!(),
-         };
-         let res = get_rpath_relative_to_output(config,
--                                               Path::new("lib/libstd.so"));
-+                                               Path::new("lib/libstd.so"),
-+                                               &omit);
-         assert_eq!(res, "@loader_path/../lib");
-     } else {
-         let config = &mut RPathConfig {
-@@ -72,7 +75,8 @@
-             linker_is_gnu: true,
-         };
-         let res = get_rpath_relative_to_output(config,
--                                               Path::new("lib/libstd.so"));
-+                                               Path::new("lib/libstd.so"),
-+                                               &omit);
-         assert_eq!(res, "$ORIGIN/../lib");
-     }
- }
-