aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-08-30 15:53:31 +0200
committerRasmus Thomsen <oss@cogitri.dev>2020-08-30 16:07:43 +0000
commit958896816a6c9d53cd11ff23c60ac1f925a2e03e (patch)
tree8790cacbc5f61f87dadb85e212e5cc0f6ed4f55b
parent9f2d4a2164a0aa92aab56fbb84091d4e82ddd7e9 (diff)
downloadaports-958896816a6c9d53cd11ff23c60ac1f925a2e03e.tar.gz
aports-958896816a6c9d53cd11ff23c60ac1f925a2e03e.tar.bz2
aports-958896816a6c9d53cd11ff23c60ac1f925a2e03e.tar.xz
community/rust: upgrade to 1.46.0
-rw-r--r--community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch6
-rw-r--r--community/rust/APKBUILD10
-rw-r--r--community/rust/alpine-move-py-scripts-to-share.patch14
3 files changed, 16 insertions, 14 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 61a2d28e2c..3025cc3343 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,7 +25,7 @@ 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,12 @@
+@@ -5,17 +5,14 @@
let target = env::var("TARGET").expect("TARGET was not set");
if cfg!(feature = "llvm-libunwind")
@@ -34,6 +34,8 @@ index f24d957..28828e5 100644
{
// Build the unwinding from libunwind C/C++ source code.
llvm_libunwind::compile();
+ } else if target.contains("x86_64-fortanix-unknown-sgx") {
+ llvm_libunwind::compile();
} else if target.contains("linux") {
- if target.contains("musl") {
- // linking for musl is handled in lib.rs
@@ -43,7 +45,7 @@ index f24d957..28828e5 100644
println!("cargo:rustc-link-lib=gcc_s");
}
} else if target.contains("freebsd") {
-@@ -105,15 +102,6 @@
+@@ -145,15 +142,6 @@
cfg.file(root.join("src").join(src));
}
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 176ee61108..f0d0747bef 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.45.2
+pkgver=1.46.0
_llvmver=10
-_bootver=1.45.1
+_bootver=1.45.2
pkgrel=0
pkgdesc="The Rust Programming Language"
url="https://www.rust-lang.org"
@@ -291,14 +291,14 @@ _mv() {
mv "$@"
}
-sha512sums="5996f899d3677dd73487561d95b0bee6d6e33f7087f40806fa8176d685de9e6d42974344c855402a9fc634c0e91e0df6e33fcb3194b3e4296e1a1cb49defb98e rustc-1.45.2-src.tar.gz
+sha512sums="5c50f449930473577b1ffb5791e6a688394821b368873f788a7d6c984055500a01897523930b763a454982f31d0a2fd4e87dfe5c416dd83ec9c844017e92b98e rustc-1.46.0-src.tar.gz
d78e4aa25704ce7df5f7675f730ab5d8acf6549db956fe06e3dbf83f1aa75d6293271c54696f4d5defda10ad230b3d9710684875aec2b7dea5bbb9d0b5347096 musl-fix-linux_musl_base.patch
803c426f67cfa2bca93bd31c6a5228fdbcd51027073d482ada2854bb68c683bb1320c5c4db0d62ec8054b8cbc7ccb41120894a89843d4eff62ea422ca92d7340 need-rpath.patch
5bb8b60fee2540bfb3df0c0759d540eb5c29f861d8ed4640768fd8f5bc28fb781e2aafe37002dfc0fb0fc4c5c50be7e35981a0814b2a175368397463d0411910 need-ssp_nonshared.patch
-3174719868d9cef70502ea08272dc1f269a9f0f568635cc2a7079d164605b380dcc8a16771742443fa3ed90400d3d3efbad9600c0b05b4a8cb5f7e6f9efb8370 alpine-move-py-scripts-to-share.patch
+03a179e31c95f88a98fb1ba6b2fd0baaf9fe1a74ade76d3096fe45ddc5e453c25109355e667783d9be1bcc585445d07b7270cb3e6e403de971049714f2c6f91a 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
-9cb9542a13cc356b9f67be02cbe43cfd8d95c79fd561ed5ff5fe1741219e7571904046312be7ab3bda0944ce83bf10c5ddd3e32f19a16334ee445031128354da 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
+55d9debccabcd36a35d46737f7fe582122babeb4eac047796ae69a152835a377f249371c1572afeff46bf815d784b4b393853555e658120f31db52781252d806 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
diff --git a/community/rust/alpine-move-py-scripts-to-share.patch b/community/rust/alpine-move-py-scripts-to-share.patch
index 62ef9de2e1..21be36faa1 100644
--- a/community/rust/alpine-move-py-scripts-to-share.patch
+++ b/community/rust/alpine-move-py-scripts-to-share.patch
@@ -12,12 +12,12 @@
# Set the environment variable `RUST_GDB` to overwrite the call to a
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
-@@ -35,7 +35,7 @@
- fi
+@@ -8,7 +8,7 @@
- # Prepare commands that will be loaded before any file on the command line has been loaded
--script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\""
-+script_import="command script import \"$RUSTC_SYSROOT/share/rust/etc/lldb_rust_formatters.py\""
- category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust"
- category_enable="type category enable Rust"
+ # Find out where to look for the pretty printer Python module
+ RUSTC_SYSROOT=$(rustc --print sysroot)
+-RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
++RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc"
+ lldb=lldb
+ if [ -f "$RUST_LLDB" ]; then