aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-10-09 18:36:41 +0200
committerRasmus Thomsen <oss@cogitri.dev>2020-10-17 08:20:37 +0000
commit3b4330f3ccea3432e8f7319a9dfc3cbc29918ca2 (patch)
tree02d3e38c2f661e3fb2a80875ef8f63368d77abc0
parent3f475c8eb028d8d0b26b07c82b38228932832638 (diff)
downloadaports-3b4330f3ccea3432e8f7319a9dfc3cbc29918ca2.tar.gz
aports-3b4330f3ccea3432e8f7319a9dfc3cbc29918ca2.tar.bz2
aports-3b4330f3ccea3432e8f7319a9dfc3cbc29918ca2.tar.xz
community/rust: upgrade to 1.47.0
-rw-r--r--community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch8
-rw-r--r--community/rust/APKBUILD12
-rw-r--r--community/rust/need-ssp_nonshared.patch4
3 files changed, 12 insertions, 12 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 3025cc3343..b89336be46 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
@@ -11,8 +11,8 @@ Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl
diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
index 9182e349b19..0377fbb58fc 100644
---- a/src/libunwind/lib.rs
-+++ b/src/libunwind/lib.rs
+--- a/library/unwind/src/lib.rs
++++ b/library/unwind/src/lib.rs
@@ -23,6 +23,6 @@ cfg_if::cfg_if! {
}
@@ -23,8 +23,8 @@ index 9182e349b19..0377fbb58fc 100644
extern {}
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
+--- a/library/unwind/build.rs
++++ b/library/unwind/build.rs
@@ -5,17 +5,14 @@
let target = env::var("TARGET").expect("TARGET was not set");
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 934baf728a..97de213bb2 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -4,10 +4,10 @@
# Contributor: Jeizsm <jeizsm@gmail.com>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=rust
-pkgver=1.46.0
+pkgver=1.47.0
_llvmver=10
-_bootver=1.45.2
-pkgrel=2
+_bootver=1.46.0
+pkgrel=0
pkgdesc="The Rust Programming Language"
url="https://www.rust-lang.org"
arch="x86_64 armv7 armhf aarch64 x86 ppc64le"
@@ -291,14 +291,14 @@ _mv() {
mv "$@"
}
-sha512sums="5c50f449930473577b1ffb5791e6a688394821b368873f788a7d6c984055500a01897523930b763a454982f31d0a2fd4e87dfe5c416dd83ec9c844017e92b98e rustc-1.46.0-src.tar.gz
+sha512sums="a6df9e2d599806eeddbfb35f7dea976781533f63d369a765b8a304221281c9f9e642ff952978f69eaaa0b28740ab5ea566b35ce481097c37fd5117bfec1f43dd rustc-1.47.0-src.tar.gz
d78e4aa25704ce7df5f7675f730ab5d8acf6549db956fe06e3dbf83f1aa75d6293271c54696f4d5defda10ad230b3d9710684875aec2b7dea5bbb9d0b5347096 musl-fix-linux_musl_base.patch
803c426f67cfa2bca93bd31c6a5228fdbcd51027073d482ada2854bb68c683bb1320c5c4db0d62ec8054b8cbc7ccb41120894a89843d4eff62ea422ca92d7340 need-rpath.patch
-5bb8b60fee2540bfb3df0c0759d540eb5c29f861d8ed4640768fd8f5bc28fb781e2aafe37002dfc0fb0fc4c5c50be7e35981a0814b2a175368397463d0411910 need-ssp_nonshared.patch
+7a8fd00e034e069dc83a0238ba43ba685de89681fc98df49ca2c52bbf404ece475372ad094a5b9fa28d4fd42c2efdd68f7016113124413287ab13d680043e7bb need-ssp_nonshared.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
-55d9debccabcd36a35d46737f7fe582122babeb4eac047796ae69a152835a377f249371c1572afeff46bf815d784b4b393853555e658120f31db52781252d806 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
+1c5c04a20f70162b0a9576c0f3c679ca6934bdc991165c3d58e44cece4f19ca597c4a3865f570a92f8de156b401df3a2380b1418ccdf760965883a1df288ea7d 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
diff --git a/community/rust/need-ssp_nonshared.patch b/community/rust/need-ssp_nonshared.patch
index 2a852400ab..8774adc4e7 100644
--- a/community/rust/need-ssp_nonshared.patch
+++ b/community/rust/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.41.0-src/library/std/build.rs.orig 2020-02-08 17:05:40.390387794 +0200
++++ rustc-1.41.0-src/library/std/build.rs 2020-02-08 17:09:46.844426452 +0200
@@ -11,6 +11,8 @@
println!("cargo:rustc-link-lib=dl");
println!("cargo:rustc-link-lib=rt");