community/rust: upgrade to 1.29.0

4 files changed, 17 insertions, 66 deletions

diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 55892cad97..f00d1517de 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -3,10 +3,10 @@
 # Contributor: Jeizsm <jeizsm@gmail.com>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=rust
-pkgver=1.28.0
+pkgver=1.29.0
 # TODO: bump to 6 as soon as we add llvm6
 _llvmver=5
-_bootver=1.27.0
+_bootver=1.28.0
 pkgrel=0
 pkgdesc="The Rust Programming Language"
 url="http://www.rust-lang.org"
@@ -71,7 +71,6 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz
 	bootstrap-tool-respect-tool-config.patch
 	cargo-tests-fix-build-auth-http_auth_offered.patch
 	cargo-tests-ignore-resolving_minimum_version_with_transitive_deps.patch
-	cargo-tests-fix-build-target.patch
 	check-rustc
 	"
 builddir="$srcdir/rustc-$pkgver-src"
@@ -271,13 +270,13 @@ _mv() {
 	mv $@
 }
 
-sha512sums="4e4f121ee5a8a9f8e1ddb6ca5a0c43ba15c1349ecea9478fbcd0b242bf438b498f76bee97d33b9e078a47395e44cdea4c5aa0941e7dd21167abdf94314ef10ce  rustc-1.28.0-src.tar.gz
-768f999d88b74c89b595a29028041807b963c72da22cc9d9f96ae3d366a9bcac12ec65520510509560ed0cfa19b6988975e201e9be8349e41192aed82641afba  musl-fix-static-linking.patch
+sha512sums="3c6b79cce5a42553bc4360591c6e6b42b36f035243b8cb688a0d4b08c10793e59d257bf9e781c9345c92f765a63a9e161e3e3346f02ddc733e4b401cb5aeb302  rustc-1.29.0-src.tar.gz
+6713d0d0ccac6b17ed47e486c6d74d1f913887bf88d42527576188fa98063a33a1ea903967847d52126b996f965577f1311344d6e57063b1625221847290a0ed  musl-fix-static-linking.patch
 3615b815cfb4eae60f3291dc07a292e1be6048eeddcb21c595bddbe8cca6a622e5b76be72a76f6b65b4d33abdc34a792ce010b024b2818a4d73bce3f85b3eb2b  musl-fix-linux_musl_base.patch
 e40d41a6dc5d400d6672f1836cd5b9e00391f7beb52e872d87db76bc95a606ce6aaae737a0256a1e5fba77c83bb223818d214dbe87028d47be65fb43c101595c  llvm-with-ffi.patch
 9fe4c230165a29ffc5557952d20e62b42e0c384a874e2584fa227239b44d20079878a740e525a51a1262d5a2194b2efe0b4e2e846fe317ea4c496d5fc1834671  static-pie.patch
 487d479a15b43c3e1ee28c111206a4f488be933309f3c6571be7ec33da4e955cc1ee907b7729b4228cb292ca7b3324eb6ba4f32a01abc3d04573a0d96982569a  need-rpath.patch
-4362dcc4e9bbe2803337ca39ff97b5206feb42fd86580a108146153f323732e8d1e109edbf6a5d68791975cae7dd185b8220fc8edd62484b8ca31b1d39ab67b8  minimize-rpath.patch
+5e8557e72b250b8726b821541dc7d0e40d8179220cfdacd6d74ed19c756ffb214d9f882e82856acb4fbfbfe5c70f1c6de6813db3ba92a2c0e2e425bb5eb620ba  minimize-rpath.patch
 0c0aa7eeddeb578c320a94696a4437fbf083ef4d6f8049512de82548285f37ec4460b5d04f087dc303a5f62a09b5d13b7f0c4fbbdb0b321147ae030e7282ac07  alpine-move-py-scripts-to-share.patch
 61aa415d754e9e01236481a1f3c9d5242f2d633e6f11b998e9ffcc07bf5c182d87c0c973dab6f10e4bb3ab4b4a4857bf9ed8dd664c49a65f6175d27db2774db1  alpine-change-rpath-to-rustlib.patch
 a688b4bc2420bf05c6ae724c9a4e6821267716032f69a9a44cb395407276df7fb37fc145f8d274b5fa03e7173c338871c9d2294a90726ef16bd087fbe6a77b66  alpine-target.patch
@@ -285,5 +284,4 @@ a688b4bc2420bf05c6ae724c9a4e6821267716032f69a9a44cb395407276df7fb37fc145f8d274b5
 c2ccab15d48c11cc3af549a3944ca0d29cb3790345468f4f3779e5ac931554dea603e5523281fc391ba4a555ee468b516961c4cb8ecee007eadacf114f3d8758  bootstrap-tool-respect-tool-config.patch
 332a6af59edc507baa73eda1de60591dd4202f540541769ac1bcbc731267f4523ea309d2c3b1f5a9dc3db32831942a5d3d40b81882dad0bf0b5ee7f74f1d6477  cargo-tests-fix-build-auth-http_auth_offered.patch
 3d6f027088e1ec189ce864bf5ed150ccad8be5d9fc0973f1b4d202eec6eab865834403335a9f0765bbfa54638aed7f5d5f2183ba9dfeab9f5bc4ef48111a8427  cargo-tests-ignore-resolving_minimum_version_with_transitive_deps.patch
-afa9b770c78857612078660966af0d800671b53bb5cfa717e9584efcca55ed3af451f2b05bf2d4168a4f992cdb5e1e21445ce6b1a09830e1bf5edfb5f92ef98c  cargo-tests-fix-build-target.patch
 c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125  check-rustc"
diff --git a/community/rust/cargo-tests-fix-build-target.patch b/community/rust/cargo-tests-fix-build-target.patch
deleted file mode 100644
index 413053ff6b..0000000000
--- a/community/rust/cargo-tests-fix-build-target.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-failures:
-
----- cfg::cfg_looks_at_rustflags_for_target stdout ----
-        running `/home/build/aports/community/rust/src/rustc-1.27.0-src/build/x86_64-alpine-linux-musl/stage2-tools/x86_64-alpine-linux-musl/release/cargo build --target x86_64-unkn
-own-linux-gnu`
-thread 'cfg::cfg_looks_at_rustflags_for_target' panicked at '
-Expected: execs
-    but: exited with exit code: 101
---- stdout
-
---- stderr
-   Compiling b v0.0.1 (file:///home/build/aports/community/rust/src/rustc-1.27.0-src/build/x86_64-alpine-linux-musl/stage2-tools/x86_64-alpine-linux-musl/cit/t356/foo/b)
-error[E0463]: can't find crate for `std`
-  |
-  = note: the `x86_64-unknown-linux-gnu` target may not be installed
-
---- a/src/tools/cargo/tests/testsuite/cfg.rs
-+++ b/src/tools/cargo/tests/testsuite/cfg.rs
-@@ -449,7 +449,7 @@ fn cfg_looks_at_rustflags_for_target() {
-         .build();
- 
-     assert_that(
--        p.cargo("build --target x86_64-unknown-linux-gnu")
-+        p.cargo("build --target x86_64-alpine-linux-musl")
-             .env("RUSTFLAGS", "--cfg with_b"),
-         execs().with_status(0),
-     );
---- a/src/tools/cargo/tests/testsuite/rustdoc.rs
-+++ b/src/tools/cargo/tests/testsuite/rustdoc.rs
-@@ -269,13 +269,13 @@
-         .build();
- 
-     assert_that(
--        p.cargo("rustdoc --verbose --target x86_64-unknown-linux-gnu"),
-+        p.cargo("rustdoc --verbose --target x86_64-alpine-linux-musl"),
-         execs().with_status(0).with_stderr("\
- [DOCUMENTING] a v0.0.1 ([..])
- [RUNNING] `rustdoc --crate-name a src[/]lib.rs \
--    --target x86_64-unknown-linux-gnu \
--    -o [..]foo[/]target[/]x86_64-unknown-linux-gnu[/]doc \
--    -L dependency=[..]foo[/]target[/]x86_64-unknown-linux-gnu[/]debug[/]deps \
-+    --target x86_64-alpine-linux-musl \
-+    -o [..]foo[/]target[/]x86_64-alpine-linux-musl[/]doc \
-+    -L dependency=[..]foo[/]target[/]x86_64-alpine-linux-musl[/]debug[/]deps \
-     -L dependency=[..]foo[/]target[/]debug[/]deps`
- [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]"),
-     );
diff --git a/community/rust/minimize-rpath.patch b/community/rust/minimize-rpath.patch
index 32c5c1b52b..3ae6a7efe1 100644
--- a/community/rust/minimize-rpath.patch
+++ b/community/rust/minimize-rpath.patch
@@ -50,8 +50,8 @@ and skip it there.
      let mut output = cwd.join(&config.out_filename);
      output.pop();
      let output = fs::canonicalize(&output).unwrap_or(output);
--    let relative = path_relative_from(&lib, &output)
--        .expect(&format!("couldn't create relative path from {:?} to {:?}", output, lib));
+-    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,
diff --git a/community/rust/musl-fix-static-linking.patch b/community/rust/musl-fix-static-linking.patch
index b72c725526..b1e6a694ac 100644
--- a/community/rust/musl-fix-static-linking.patch
+++ b/community/rust/musl-fix-static-linking.patch
@@ -12,18 +12,18 @@ static linking is requested, instead of dynamically as before.
 
 --- a/src/librustc_codegen_llvm/back/link.rs
 +++ b/src/librustc_codegen_llvm/back/link.rs
-@@ -1151,13 +1151,13 @@
-     let relevant_libs = trans.crate_info.used_libraries.iter().filter(|l| {
-         relevant_lib(sess, l)
-     });
- 
+@@ -1218,13 +1218,13 @@ fn add_local_native_libraries(cmd: &mut dyn Linker,
      let search_path = archive_search_paths(sess);
      for lib in relevant_libs {
+         let name = match lib.name {
+             Some(ref l) => l,
+             None => continue,
+         };
          match lib.kind {
--            NativeLibraryKind::NativeUnknown => cmd.link_dylib(&lib.name.as_str()),
-+            NativeLibraryKind::NativeUnknown => if sess.crt_static() { cmd.link_staticlib(&lib.name.as_str()) } else { cmd.link_dylib(&lib.name.as_str()) },
-             NativeLibraryKind::NativeFramework => cmd.link_framework(&lib.name.as_str()),
-             NativeLibraryKind::NativeStaticNobundle => cmd.link_staticlib(&lib.name.as_str()),
-             NativeLibraryKind::NativeStatic => cmd.link_whole_staticlib(&lib.name.as_str(),
+-            NativeLibraryKind::NativeUnknown => cmd.link_dylib(&name.as_str()),
++            NativeLibraryKind::NativeUnknown => if sess.crt_static() { cmd.link_staticlib(&name.as_str()) } else { cmd.link_dylib(&name.as_str()) },
+             NativeLibraryKind::NativeFramework => cmd.link_framework(&name.as_str()),
+             NativeLibraryKind::NativeStaticNobundle => cmd.link_staticlib(&name.as_str()),
+             NativeLibraryKind::NativeStatic => cmd.link_whole_staticlib(&name.as_str(),
                                                                          &search_path)
          }