From c164a511b2ae865f934ff66d76ce1645ea5030e7 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 24 Oct 2020 21:30:10 +0200 Subject: [PATCH 1/2] rust: update to 1.47.0 --- ...dlib-and-musl_root-from-musl-targets.patch | 10 +++--- ...fer-libgcc_eh-over-libunwind-on-musl.patch | 8 ++--- ...nore-broken-and-non-applicable-tests.patch | 14 -------- ...e-debugger-scripts-to-usr-share-rust.patch | 9 ------ ...kage-of-musl-libc-for-the-libc-crate.patch | 29 +++++++++++++++++ .../patches/fix-lzma2-sys-big-endian.patch | 32 ------------------- srcpkgs/rust/patches/need-ssp_nonshared.patch | 8 ++--- srcpkgs/rust/template | 25 +++++++-------- 8 files changed, 53 insertions(+), 82 deletions(-) delete mode 100644 srcpkgs/rust/patches/fix-lzma2-sys-big-endian.patch diff --git a/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch index f4218818445..a6b0650508d 100644 --- a/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch +++ b/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch @@ -232,16 +232,14 @@ index 2a46c563..025928b9 100755 v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs", "rootfs in qemu testing, you probably don't want to use this") v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index c7e63990..77bbb2cd 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -881,25 +882,6 @@ +@@ -876,25 +876,6 @@ } } - /// Returns the "musl root" for this `target`, if defined -- fn musl_root(&self, target: Interned) -> Option<&Path> { +- fn musl_root(&self, target: TargetSelection) -> Option<&Path> { - self.config - .target_config - .get(&target) @@ -251,7 +249,7 @@ index c7e63990..77bbb2cd 100644 - } - - /// Returns the "musl libdir" for this `target`. -- fn musl_libdir(&self, target: Interned) -> Option { +- fn musl_libdir(&self, target: TargetSelection) -> Option { - let t = self.config.target_config.get(&target)?; - if let libdir @ Some(_) = &t.musl_libdir { - return libdir.clone(); @@ -260,7 +258,7 @@ index c7e63990..77bbb2cd 100644 - } - /// Returns the sysroot for the wasi target, if defined - fn wasi_root(&self, target: Interned) -> Option<&Path> { + 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/sanity.rs b/src/bootstrap/sanity.rs index 530e74da..8ec9f046 100644 diff --git a/srcpkgs/rust/patches/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch b/srcpkgs/rust/patches/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch index 3b8df62d67c..6571cb3c222 100644 --- a/srcpkgs/rust/patches/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch +++ b/srcpkgs/rust/patches/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch @@ -10,8 +10,8 @@ Subject: [PATCH 05/15] Prefer libgcc_eh over libunwind on musl diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs index a24808b3..a1250889 100644 ---- a/src/libunwind/build.rs -+++ b/src/libunwind/build.rs +--- a/library/unwind/build.rs ++++ b/library/unwind/build.rs @@ -5,17 +5,14 @@ let target = env::var("TARGET").expect("TARGET was not set"); @@ -50,8 +50,8 @@ index a24808b3..a1250889 100644 } diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs index 18d41be7..17f73d69 100644 ---- a/src/libunwind/lib.rs -+++ b/src/libunwind/lib.rs +--- a/library/unwind/src/lib.rs ++++ b/library/unwind/src/lib.rs @@ -19,7 +19,7 @@ cfg_if::cfg_if! { } diff --git a/srcpkgs/rust/patches/0008-Ignore-broken-and-non-applicable-tests.patch b/srcpkgs/rust/patches/0008-Ignore-broken-and-non-applicable-tests.patch index f9d64723903..aa6e829074a 100644 --- a/srcpkgs/rust/patches/0008-Ignore-broken-and-non-applicable-tests.patch +++ b/srcpkgs/rust/patches/0008-Ignore-broken-and-non-applicable-tests.patch @@ -73,19 +73,5 @@ index c5c824ac..f3fe047a 100644 // ignore-android // ignore-windows // ignore-cloudabi no execve -diff --git a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs -index b28f742a..3ee4ccce 100644 ---- a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs -+++ b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs -@@ -2,6 +2,8 @@ - #![allow(non_camel_case_types)] - - // ignore-emscripten -+// ignore-powerpc -+// ignore-powerpc64 - - // Test that the simd_bitmask intrinsic produces correct results. - --- 2.26.2 diff --git a/srcpkgs/rust/patches/0010-Move-debugger-scripts-to-usr-share-rust.patch b/srcpkgs/rust/patches/0010-Move-debugger-scripts-to-usr-share-rust.patch index 7f913c8e631..c9f51324e97 100644 --- a/srcpkgs/rust/patches/0010-Move-debugger-scripts-to-usr-share-rust.patch +++ b/srcpkgs/rust/patches/0010-Move-debugger-scripts-to-usr-share-rust.patch @@ -35,12 +35,3 @@ index 23ba93da..dc51b16c 100755 # Run GDB with the additional arguments that load the pretty printers # Set the environment variable `RUST_GDB` to overwrite the call to a - ---- a/src/etc/lldb_commands -+++ b/src/etc/lldb_commands -@@ -1,4 +1,4 @@ --command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\" -+command script import \"$RUSTC_SYSROOT/share/rust/etc/lldb_lookup.py\" - type synthetic add -l lldb_lookup.synthetic_lookup -x \".*\" --category Rust - type summary add -F lldb_lookup.summary_lookup -e -x -h \"^(alloc::([a-z_]+::)+)String$\" --category Rust - type summary add -F lldb_lookup.summary_lookup -e -x -h \"^&str$\" --category Rust 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 e0b567c419e..d877efb36fd 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 @@ -35,6 +35,35 @@ index 238da24b..ffb05ee7 100644 + link(name = "gcc", kind = "static-nobundle", cfg(target_feature = "crt-static")))] - #[cfg_attr(feature = "rustc-dep-of-std", +- link(name = "c", cfg(not(target_feature = "crt-static"))))] + extern {} + } else if #[cfg(target_os = "emscripten")] { + #[link(name = "c")] +index 0b1496af..7f7e85a7 100644 +--- a/vendor/libc-0.2.74/src/lib.rs ++++ b/vendor/libc-0.2.74/src/lib.rs +@@ -33,6 +33,7 @@ + #![deny(missing_copy_implementations, safe_packed_borrows)] + #![no_std] + #![cfg_attr(feature = "rustc-dep-of-std", no_core)] ++#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))] + #![cfg_attr(target_os = "redox", feature(static_nobundle))] + #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))] + +index 238da24b..ffb05ee7 100644 +--- a/vendor/libc-0.2.74/src/unix/mod.rs ++++ b/vendor/libc-0.2.74/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. + } else if #[cfg(target_env = "musl")] { ++ #[link(name = "c")] ++ extern {} + #[cfg_attr(feature = "rustc-dep-of-std", +- link(name = "c", kind = "static", ++ link(name = "gcc", kind = "static-nobundle", + cfg(target_feature = "crt-static")))] +- #[cfg_attr(feature = "rustc-dep-of-std", - link(name = "c", cfg(not(target_feature = "crt-static"))))] extern {} } else if #[cfg(target_os = "emscripten")] { diff --git a/srcpkgs/rust/patches/fix-lzma2-sys-big-endian.patch b/srcpkgs/rust/patches/fix-lzma2-sys-big-endian.patch deleted file mode 100644 index 96e0eb0a7ce..00000000000 --- a/srcpkgs/rust/patches/fix-lzma2-sys-big-endian.patch +++ /dev/null @@ -1,32 +0,0 @@ -We need this as the rust-installer tool would otherwise -generate corrupt tarballs on big endian targets. This -matters when generating bootstrap tar.xz tarballs. - -From f01c8060310ab3456f93567cb819384c4ae4e117 Mon Sep 17 00:00:00 2001 -From: Alex Crichton -Date: Thu, 22 Aug 2019 22:46:47 -0700 -Subject: [PATCH] Fix tests on big-endian targets - -Turns out liblzma wants to be compiled with options to indicate that -it's big endian! ---- - lzma-sys/build.rs | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/lzma-sys/build.rs b/lzma-sys/build.rs -index 7366d9c..a1e28b4 100644 ---- a/vendor/lzma-sys/build.rs -+++ b/vendor/lzma-sys/build.rs -@@ -56,6 +56,12 @@ fn main() { - build.flag("-std=c99").flag("-pthread"); - } - -+ if let Ok(s) = env::var("CARGO_CFG_TARGET_ENDIAN") { -+ if s == "big" { -+ build.define("WORDS_BIGENDIAN", None); -+ } -+ } -+ - build.compile("liblzma.a"); - } - diff --git a/srcpkgs/rust/patches/need-ssp_nonshared.patch b/srcpkgs/rust/patches/need-ssp_nonshared.patch index 0795dfaf3b4..f5226034532 100644 --- a/srcpkgs/rust/patches/need-ssp_nonshared.patch +++ b/srcpkgs/rust/patches/need-ssp_nonshared.patch @@ -1,5 +1,5 @@ ---- rustc-1.41.0-src/src/libstd/build.rs.orig 2020-02-08 17:05:40.390387794 +0200 -+++ rustc-1.41.0-src/src/libstd/build.rs 2020-02-08 17:09:46.844426452 +0200 +--- rustc-1.47.0-src/library/std/build.rs.orig ++++ rustc-1.47.0-src/library/std/build.rs @@ -11,6 +11,8 @@ println!("cargo:rustc-link-lib=dl"); println!("cargo:rustc-link-lib=rt"); @@ -9,8 +9,8 @@ } } else if target.contains("freebsd") { println!("cargo:rustc-link-lib=execinfo"); ---- rustc-1.44.0-src/src/libunwind/build.rs -+++ rustc-1.44.0-src/src/libunwind/build.rs +--- rustc-1.44.0-src/library/unwind/build.rs.orig ++++ rustc-1.44.0-src/library/unwind/build.rs @@ -12,6 +12,9 @@ fn main() { } else if target.contains("linux") { if !target.contains("android") { diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index f49f11383fe..8ab51c4c0dd 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -4,22 +4,22 @@ # Permission to use rust and cargo trademark is granted. # See: https://github.com/rust-lang/core-team/issues/4 pkgname=rust -version=1.46.0 +version=1.47.0 revision=1 -_rust_dist_version=1.45.2 +_rust_dist_version=1.46.0 _cargo_dist_version=0.46.1 # Always make sure custom distfiles used for bootstrap are # uploaded to https://alpha.de.repo.voidlinux.org/distfiles/ wrksrc="rustc-${version}-src" hostmakedepends="cmake curl pkg-config python3 tar" -makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm10" +makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm11" depends="rust-std" 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="2d6a3b7196db474ba3f37b8f5d50a1ecedff00738d7846840605b42bfc922728" +checksum="3185df064c4747f2c8b9bb8c4468edd58ff4ad6d07880c879ac1b173b768d81d" lib32disabled=yes patch_args="-Np1" @@ -29,7 +29,7 @@ desc_option_bindist="Generate tarballs for bootstrap" _bootstrap_dir="stage0-bootstrap" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" cargo llvm10" + hostmakedepends+=" cargo llvm11" # These are required for building the buildhost's stage0/1 hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" else @@ -51,20 +51,20 @@ else case "$XBPS_MACHINE" in i686) checksum+=" - 72676b7bb6a6ad056af2ad5459b1ac3992b7a65b823ed7f00d4af72266e0f1ad - 05474dbec0385c8dcfd940e6f8954d4f8284745a4fbcf57932022b1593829463 + aba3f00f93c02c11a8aae63d850d1fd4128fba0df0f4ed4ae6695f84f51d4149 + a679665ae4602ac035e2ec6a7d9e5e44e7a01cf69e8d004bfcf8c1fa6bbc19bb 8931dba1c23405fe630aa4ca2aceaba7de74c21cc03947c757b349d004d6a4d6" ;; x86_64) checksum+=" - 0be5c8506fd9317c7d0dc8044b5fef8501caa74f88a9a22be795d68362dc57f6 - 02309322467af8e37256ccf1f064f5233c7fca4423dffde0bd5eb32cde46942a + 6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12 + e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c a27eb5d47b520ef2c554605bf789f80652af63531b4f6a1195d61b3dfd0f6e9c" ;; x86_64-musl) checksum+=" - 9a971ff29e01243b08f6f3c220ab5d608489637a6b5d81ba2e8a78007901ced0 - e8081032d53baa129c41c4c2bfb025648ac321c9c809f377110f8a26f7ce1cdb + 130fb0ef33324996bd87abcc5d6835b0fea97d9786f53c90af5986a80c1d97da + 9e7107082c5b47b8931f65d5d6a9c97b1540e67533a2e69f480d9d83e8d05d57 895a3b6928a5bf7b1ac28c339a85ddd078dd719f54245b8d845370baf8255368" ;; ppc64le) @@ -137,9 +137,8 @@ post_patch() { # clear out all the checksum nonsense of patched vendor crates _clear_vendor_checksums libc + _clear_vendor_checksums libc-0.2.74 _clear_vendor_checksums typenum - _clear_vendor_checksums backtrace-sys - _clear_vendor_checksums lzma-sys } do_configure() { From 09ec1c4d574484a3bb364c2ed29c74343642aed0 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 22 Nov 2020 21:06:37 +0100 Subject: [PATCH 2/2] rust: update to 1.48.0 --- .../patches/00016-do-not-copy-libunwind.patch | 26 ++++++++++++ ...ative-libraries-when-linking-static-.patch | 4 +- ...dlib-and-musl_root-from-musl-targets.patch | 42 +++++++++---------- ...mically-link-libc-on-musl-by-default.patch | 4 +- ...kage-of-musl-libc-for-the-libc-crate.patch | 28 ------------- ...-against-host-target-LLVM-in-cross-s.patch | 4 +- ...e-ELFv2-ABI-on-all-powerpc64-targets.patch | 8 ++-- srcpkgs/rust/patches/need-ssp_nonshared.patch | 8 ++-- srcpkgs/rust/template | 15 ++++--- 9 files changed, 68 insertions(+), 71 deletions(-) create mode 100644 srcpkgs/rust/patches/00016-do-not-copy-libunwind.patch diff --git a/srcpkgs/rust/patches/00016-do-not-copy-libunwind.patch b/srcpkgs/rust/patches/00016-do-not-copy-libunwind.patch new file mode 100644 index 00000000000..73c496acafd --- /dev/null +++ b/srcpkgs/rust/patches/00016-do-not-copy-libunwind.patch @@ -0,0 +1,26 @@ +From 227096bde5283269aa1d1002860b6ec54d2cf284 Mon Sep 17 00:00:00 2001 +From: Johannes Brechtmann +Date: Sun, 22 Nov 2020 16:00:50 +0100 +Subject: [PATCH] Revert "Include libunwind in the rust-src component." + +This reverts commit 9f27f3796d3487411ab035803a0757d69040649c. +--- + src/bootstrap/dist.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index b2a590307a2..020cd665a0e 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -1016,7 +1016,7 @@ impl Step for Src { + copy_src_dirs( + builder, + &builder.src, +- &["library", "src/llvm-project/libunwind"], ++ &["library"], + &[ + // not needed and contains symlinks which rustup currently + // chokes on when unpacking. +-- +2.29.2 + diff --git a/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch b/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch index 77e5551e73e..1f345ca1462 100644 --- a/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch +++ b/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch @@ -17,8 +17,8 @@ Fixes #54243 diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs index 0dd2f029..f22b4277 100644 ---- a/src/librustc_codegen_ssa/back/link.rs -+++ b/src/librustc_codegen_ssa/back/link.rs +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1964,9 +1964,7 @@ } } diff --git a/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch index a6b0650508d..326ed1a4ed1 100644 --- a/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch +++ b/srcpkgs/rust/patches/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch @@ -141,16 +141,16 @@ diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 56164b74..8c46334a 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -135,8 +135,6 @@ +@@ -154,8 +154,6 @@ pub print_step_timings: bool, pub missing_tools: bool, - + - // Fallback musl-root for all targets - pub musl_root: Option, pub prefix: Option, pub sysconfdir: Option, pub datadir: Option, -@@ -172,8 +170,6 @@ +@@ -252,8 +250,6 @@ pub linker: Option, pub ndk: Option, pub crt_static: Option, @@ -159,7 +159,7 @@ index 56164b74..8c46334a 100644 pub wasi_root: Option, pub qemu_rootfs: Option, pub no_std: bool, -@@ -327,7 +323,6 @@ +@@ -438,7 +434,6 @@ parallel_compiler: Option, default_linker: Option, channel: Option, @@ -167,7 +167,7 @@ index 56164b74..8c46334a 100644 rpath: Option, verbose_tests: Option, optimize_tests: Option, -@@ -363,8 +358,6 @@ +@@ -475,8 +470,6 @@ llvm_filecheck: Option, android_ndk: Option, crt_static: Option, @@ -176,23 +176,23 @@ index 56164b74..8c46334a 100644 wasi_root: Option, qemu_rootfs: Option, no_std: Option, -@@ -592,7 +585,6 @@ +@@ -806,7 +799,6 @@ 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.clone(); -- config.musl_root = rust.musl_root.clone().map(PathBuf::from); - config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from); + 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); set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings)); set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); -@@ -632,8 +624,6 @@ - target.ranlib = cfg.ranlib.clone().map(PathBuf::from); - target.linker = cfg.linker.clone().map(PathBuf::from); +@@ -846,8 +838,6 @@ + target.ranlib = cfg.ranlib.map(PathBuf::from); + target.linker = cfg.linker.map(PathBuf::from); target.crt_static = cfg.crt_static; -- target.musl_root = cfg.musl_root.clone().map(PathBuf::from); -- target.musl_libdir = cfg.musl_libdir.clone().map(PathBuf::from); - target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); - target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); - +- target.musl_root = cfg.musl_root.map(PathBuf::from); +- target.musl_libdir = cfg.musl_libdir.map(PathBuf::from); + target.wasi_root = cfg.wasi_root.map(PathBuf::from); + target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from); + diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index 2a46c563..025928b9 100755 --- a/src/bootstrap/configure.py @@ -295,8 +295,8 @@ index 530e74da..8ec9f046 100644 // Cygwin. The Cygwin build does not have generators for Visual diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs index e294e639..58ae91a9 100644 ---- a/src/librustc_target/spec/linux_musl_base.rs -+++ b/src/librustc_target/spec/linux_musl_base.rs +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs @@ -10,10 +10,6 @@ // argument is *not* necessary for normal builds, but it can't hurt! base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,--eh-frame-hdr".to_string()); @@ -308,8 +308,8 @@ index e294e639..58ae91a9 100644 // These targets statically link libc by default base.crt_static_default = true; // These targets allow the user to choose between static and dynamic linking. ---- a/src/librustc_target/spec/crt_objects.rs.orig 2020-08-07 01:01:58.142394507 +0200 -+++ b/src/librustc_target/spec/crt_objects.rs 2020-08-07 01:02:25.030392771 +0200 +--- a/compiler/rustc_target/src/spec/crt_objects.rs.orig 2020-08-07 01:01:58.142394507 +0200 ++++ b/compiler/rustc_target/src/spec/crt_objects.rs 2020-08-07 01:02:25.030392771 +0200 @@ -61,21 +61,6 @@ ]) } diff --git a/srcpkgs/rust/patches/0011-Dynamically-link-libc-on-musl-by-default.patch b/srcpkgs/rust/patches/0011-Dynamically-link-libc-on-musl-by-default.patch index 482bfb81776..7f6ca13a95d 100644 --- a/srcpkgs/rust/patches/0011-Dynamically-link-libc-on-musl-by-default.patch +++ b/srcpkgs/rust/patches/0011-Dynamically-link-libc-on-musl-by-default.patch @@ -9,8 +9,8 @@ Subject: [PATCH 11/15] Dynamically link libc on musl by default diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs index 58ae91a9..1fae72d6 100644 ---- a/src/librustc_target/spec/linux_musl_base.rs -+++ b/src/librustc_target/spec/linux_musl_base.rs +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs @@ -1,11 +1,9 @@ -use crate::spec::crt_objects::{self, CrtObjectsFallback}; use crate::spec::TargetOptions; 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 d877efb36fd..e4d4f145b6b 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 @@ -40,34 +40,6 @@ index 238da24b..ffb05ee7 100644 } else if #[cfg(target_os = "emscripten")] { #[link(name = "c")] index 0b1496af..7f7e85a7 100644 ---- a/vendor/libc-0.2.74/src/lib.rs -+++ b/vendor/libc-0.2.74/src/lib.rs -@@ -33,6 +33,7 @@ - #![deny(missing_copy_implementations, safe_packed_borrows)] - #![no_std] - #![cfg_attr(feature = "rustc-dep-of-std", no_core)] -+#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))] - #![cfg_attr(target_os = "redox", feature(static_nobundle))] - #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))] - -index 238da24b..ffb05ee7 100644 ---- a/vendor/libc-0.2.74/src/unix/mod.rs -+++ b/vendor/libc-0.2.74/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. - } else if #[cfg(target_env = "musl")] { -+ #[link(name = "c")] -+ extern {} - #[cfg_attr(feature = "rustc-dep-of-std", -- link(name = "c", kind = "static", -+ link(name = "gcc", kind = "static-nobundle", - cfg(target_feature = "crt-static")))] -- #[cfg_attr(feature = "rustc-dep-of-std", -- link(name = "c", cfg(not(target_feature = "crt-static"))))] - extern {} - } else if #[cfg(target_os = "emscripten")] { - #[link(name = "c")] -- 2.26.2 diff --git a/srcpkgs/rust/patches/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch b/srcpkgs/rust/patches/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch index fb01e60fa5e..b4835eb3f4f 100644 --- a/srcpkgs/rust/patches/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch +++ b/srcpkgs/rust/patches/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch @@ -10,8 +10,8 @@ Subject: [PATCH 14/15] Void: fix linkage against host/target LLVM in cross diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index 9b4f03b3..d0167838 100644 ---- a/src/librustc_llvm/build.rs -+++ b/src/librustc_llvm/build.rs +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs @@ -217,9 +217,11 @@ fn main() { for lib in output(&mut cmd).split_whitespace() { if is_crossed { diff --git a/srcpkgs/rust/patches/0015-Use-ELFv2-ABI-on-all-powerpc64-targets.patch b/srcpkgs/rust/patches/0015-Use-ELFv2-ABI-on-all-powerpc64-targets.patch index bb9269e43bb..a064d178cef 100644 --- a/srcpkgs/rust/patches/0015-Use-ELFv2-ABI-on-all-powerpc64-targets.patch +++ b/srcpkgs/rust/patches/0015-Use-ELFv2-ABI-on-all-powerpc64-targets.patch @@ -14,8 +14,8 @@ so at least match the environment we have. diff --git a/src/librustc_target/abi/call/powerpc64.rs b/src/librustc_target/abi/call/powerpc64.rs index 93c4e97d..96b02486 100644 ---- a/src/librustc_target/abi/call/powerpc64.rs -+++ b/src/librustc_target/abi/call/powerpc64.rs +--- a/compiler/rustc_target/src/abi/call/powerpc64.rs ++++ b/compiler/rustc_target/src/abi/call/powerpc64.rs @@ -119,14 +119,7 @@ where Ty: TyLayoutMethods<'a, C> + Copy, C: LayoutOf> + HasDataLayout + HasTargetSpec, @@ -34,8 +34,8 @@ index 93c4e97d..96b02486 100644 classify_ret(cx, &mut fn_abi.ret, abi); diff --git a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs b/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs index 5306d905..c63eed85 100644 ---- a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs -+++ b/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs +--- a/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs @@ -1,4 +1,4 @@ -use crate::spec::{LinkerFlavor, RelroLevel, Target, TargetOptions, TargetResult}; +use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; diff --git a/srcpkgs/rust/patches/need-ssp_nonshared.patch b/srcpkgs/rust/patches/need-ssp_nonshared.patch index f5226034532..44c6dc2f26f 100644 --- a/srcpkgs/rust/patches/need-ssp_nonshared.patch +++ b/srcpkgs/rust/patches/need-ssp_nonshared.patch @@ -1,10 +1,10 @@ --- rustc-1.47.0-src/library/std/build.rs.orig +++ rustc-1.47.0-src/library/std/build.rs -@@ -11,6 +11,8 @@ +@@ -8,6 +8,8 @@ println!("cargo:rustc-link-lib=dl"); - println!("cargo:rustc-link-lib=rt"); - println!("cargo:rustc-link-lib=pthread"); -+ } else { + println!("cargo:rustc-link-lib=log"); + println!("cargo:rustc-link-lib=gcc"); ++ } else if target.contains("musl") { + println!("cargo:rustc-link-lib=ssp_nonshared"); } } else if target.contains("freebsd") { diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 8ab51c4c0dd..e311d8ee209 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -4,9 +4,9 @@ # Permission to use rust and cargo trademark is granted. # See: https://github.com/rust-lang/core-team/issues/4 pkgname=rust -version=1.47.0 +version=1.48.0 revision=1 -_rust_dist_version=1.46.0 +_rust_dist_version=1.47.0 _cargo_dist_version=0.46.1 # Always make sure custom distfiles used for bootstrap are # uploaded to https://alpha.de.repo.voidlinux.org/distfiles/ @@ -19,7 +19,7 @@ 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="3185df064c4747f2c8b9bb8c4468edd58ff4ad6d07880c879ac1b173b768d81d" +checksum="0e763e6db47d5d6f91583284d2f989eacc49b84794d1443355b85c58d67ae43b" lib32disabled=yes patch_args="-Np1" @@ -57,14 +57,14 @@ else ;; x86_64) checksum+=" - 6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12 - e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c + 6effe67c3461335eabba2334f4747260bd479c938e635899a60ed094beec7481 + a469db59f7df3a5e4003421d853b274e828b537d2d56fd5ce6bba8ba73266f02 a27eb5d47b520ef2c554605bf789f80652af63531b4f6a1195d61b3dfd0f6e9c" ;; x86_64-musl) checksum+=" - 130fb0ef33324996bd87abcc5d6835b0fea97d9786f53c90af5986a80c1d97da - 9e7107082c5b47b8931f65d5d6a9c97b1540e67533a2e69f480d9d83e8d05d57 + 9fb8267d7ed0adc9bf591c00c0dc4ed4542b399312c753affddc5e87d3bedadc + 11a181846bbc56b42f2142cc5517dc084e12b9147b215a55056fc70274f643da 895a3b6928a5bf7b1ac28c339a85ddd078dd719f54245b8d845370baf8255368" ;; ppc64le) @@ -137,7 +137,6 @@ post_patch() { # clear out all the checksum nonsense of patched vendor crates _clear_vendor_checksums libc - _clear_vendor_checksums libc-0.2.74 _clear_vendor_checksums typenum }