aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-06-07 12:49:34 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-06-13 10:20:19 +0000
commit73e434ecc4a5624f9c4dcdec7e59c58b10fe3304 (patch)
treefddf2a2f2540bfdf7ec97a871978b7aca1d005d8
parent0cbaf6b8928c5fb972d33c32e9b6488de99235c2 (diff)
downloadaports-73e434ecc4a5624f9c4dcdec7e59c58b10fe3304.tar.gz
aports-73e434ecc4a5624f9c4dcdec7e59c58b10fe3304.tar.bz2
aports-73e434ecc4a5624f9c4dcdec7e59c58b10fe3304.tar.xz
community/rust: upgrade to 1.44.0
(cherry picked from commit b8bb81426342d828890f48d71c55f3eb85d13970)
-rw-r--r--community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch28
-rw-r--r--community/rust/APKBUILD24
-rw-r--r--community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch28
-rw-r--r--community/rust/alpine-move-py-scripts-to-share.patch5
-rw-r--r--community/rust/musl-fix-static-linking.patch2
-rw-r--r--community/rust/need-rpath.patch2
-rw-r--r--community/rust/python3.patch12
-rw-r--r--community/rust/static-pie.patch24
8 files changed, 26 insertions, 99 deletions
diff --git a/community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch b/community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch
deleted file mode 100644
index 7432cd705d..0000000000
--- a/community/rust/497f879b1e24c369362bcd821959ffabc50a8a31.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream: Yes
-From 497f879b1e24c369362bcd821959ffabc50a8a31 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Mon, 2 Mar 2020 22:37:55 +0100
-Subject: [PATCH] Update CreateMemSet() usage for LLVM 10
-
----
- src/rustllvm/RustWrapper.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
-index 25cfee3373dc4..799adb418822d 100644
---- a/src/rustllvm/RustWrapper.cpp
-+++ b/src/rustllvm/RustWrapper.cpp
-@@ -1333,8 +1333,13 @@ extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B,
- LLVMValueRef Dst, unsigned DstAlign,
- LLVMValueRef Val,
- LLVMValueRef Size, bool IsVolatile) {
-+#if LLVM_VERSION_GE(10, 0)
-+ return wrap(unwrap(B)->CreateMemSet(
-+ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile));
-+#else
- return wrap(unwrap(B)->CreateMemSet(
- unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile));
-+#endif
- }
-
- extern "C" LLVMValueRef
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 49a1bb3d40..eda42de2e4 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.43.1
+pkgver=1.44.0
_llvmver=10
-_bootver=1.43.0
-pkgrel=1
+_bootver=1.43.1
+pkgrel=0
pkgdesc="The Rust Programming Language"
url="https://www.rust-lang.org"
arch="x86_64 armv7 armhf aarch64 x86 ppc64le"
@@ -69,12 +69,9 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz
alpine-target.patch
install-template-shebang.patch
check-rustc
- python3.patch
link-musl-dynamically.patch
musl-dont-use-crt-static.patch
0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
- a94fa896cc92d5e0678376cf5aa8b64af0899732.patch
- 497f879b1e24c369362bcd821959ffabc50a8a31.patch
"
builddir="$srcdir/rustc-$pkgver-src"
@@ -296,19 +293,16 @@ _mv() {
mv "$@"
}
-sha512sums="d432e908a29732516cb1784a24df9f82c20852bb0cf4d0120208b0ff542c4b0d7ad0d6d78f826dd47b1f04e07d46cf4a9ac9fe9cff89f763a7241a59288cef22 rustc-1.43.1-src.tar.gz
-8d52048070e9a158810f5ef71eae07a3b107b60986375a593c3509f4c47f8e2f7fcdff8bc558c03c46127dbf66c4077dd7b5b422a83f2c49fb5d52ecfae5697e musl-fix-static-linking.patch
+sha512sums="f0a63d5f568dd1eed9b073ae61f236cd8ec691562ae1b6f38d16b43485d0e2591f341bdebb5adedfe378c386360360340ed4782178c0b0368fea3a696e71b5a6 rustc-1.44.0-src.tar.gz
+254920807b91b36ac7555d3d750c1c3466f036cc6e138bd327e0b6e0a9e2750ef8fde0bb98a4ed6fb84f662f8e7cdee9afb75d9364f8bafe94029b9c7fe3b31f musl-fix-static-linking.patch
41fd9e8a8dd99074d95d664e65f92dba644b8ef9fa37b9a1d781a01fe49eaa254c430f0f277622dc4f8203aad2d129a045fdf1679a0da526d549fac60654be26 musl-fix-linux_musl_base.patch
-97e81c57af93df550577f41d795185a9eb0c37528776c250076cc57f06c87e81139eb71cd6b6a4730528511821ae50c304d7deb534d6422cd08bb44193ae605d static-pie.patch
-d4659b56dbf1218da98b995a0a89a8cfd069dd94b3e9aef4aee987484d96fc8b92f6d695ea4123eff26711961f2db2f7324bf5b4043f41722cd89581aac97f1c need-rpath.patch
+d28c73f1baf92355857360a877ea77cb0e67910b470fe5dd5281658dc2483eea2c6b06308c8ade6eea89957962910b4758765eb59198097fd1658aa8cd8bea46 static-pie.patch
+803c426f67cfa2bca93bd31c6a5228fdbcd51027073d482ada2854bb68c683bb1320c5c4db0d62ec8054b8cbc7ccb41120894a89843d4eff62ea422ca92d7340 need-rpath.patch
5bb8b60fee2540bfb3df0c0759d540eb5c29f861d8ed4640768fd8f5bc28fb781e2aafe37002dfc0fb0fc4c5c50be7e35981a0814b2a175368397463d0411910 need-ssp_nonshared.patch
-35e0619672843d9dd41df4a086404a59b57c12fa014e42d06102bc3856a96ed021e716f9d581ec5c89444acbaedd3edcd2b8a85576df3bb4451c0edde3afbba5 alpine-move-py-scripts-to-share.patch
+3174719868d9cef70502ea08272dc1f269a9f0f568635cc2a7079d164605b380dcc8a16771742443fa3ed90400d3d3efbad9600c0b05b4a8cb5f7e6f9efb8370 alpine-move-py-scripts-to-share.patch
080c3c1af15936c3795724d3cf0f60798ef470bce898e43b6757843bf56f6d46de3dd5b9ea3b116b2011b40373cf8daf17abc94cfff4bdb6221bd431aa0844fd alpine-target.patch
7d59258d4462eba0207739a5c0c8baf1f19d9a396e5547bb4d59d700eb94d50ba6add2e523f3e94e29e993821018594625ea4ac86304fb58f7f8c82622a26ab0 install-template-shebang.patch
c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125 check-rustc
-f71f25f4b5a0a8c3ab20ca75a63b891a89983c5ab1b25283934b175bb5142aa094f1fef515ac223ab2fa1211f2d018016e7756adb125f96f52fc35b1916a53c3 python3.patch
2a91c0d149f19a2268b2db8e375e0c10820529f588161d8d8e68900d929235d9b1cb4f0d64539c1e20ecca3948b4715f2d9d3d16a2754373d56b4b5808bed6bd link-musl-dynamically.patch
795194976763326c5e4a9eefc8b651b6d5fb533d2d000631ed48a92bafac90e9ca33b8d662e6c53ef109ea1a90c69def715d7d7154e3f9fb9035a58a313a7db3 musl-dont-use-crt-static.patch
-9cb9542a13cc356b9f67be02cbe43cfd8d95c79fd561ed5ff5fe1741219e7571904046312be7ab3bda0944ce83bf10c5ddd3e32f19a16334ee445031128354da 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
-93b6807f5b1110a09512cae9e4f65156eee9d878d52f320a410552f0d0daf190d5803bd577537adf33d3469b0e6796e3294f068509b92fa48ee786259b8c7dd6 a94fa896cc92d5e0678376cf5aa8b64af0899732.patch
-4d72efbd9ebd09b06631f3c121cbe3a080a1f9cac4ff1dab80000a841909131c1b8c8caed48f8d15971122d18878e4c9f7ebab35c77400e972f55f39016d84c0 497f879b1e24c369362bcd821959ffabc50a8a31.patch"
+9cb9542a13cc356b9f67be02cbe43cfd8d95c79fd561ed5ff5fe1741219e7571904046312be7ab3bda0944ce83bf10c5ddd3e32f19a16334ee445031128354da 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
diff --git a/community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch b/community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch
deleted file mode 100644
index 16f05f5fb8..0000000000
--- a/community/rust/a94fa896cc92d5e0678376cf5aa8b64af0899732.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Reason: Fixes LLVM10
-Upstream: Yes
-From a94fa896cc92d5e0678376cf5aa8b64af0899732 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Tue, 4 Feb 2020 20:35:50 +0100
-Subject: [PATCH] Fix timeTraceProfilerInitialize for LLVM 10
-
----
- src/rustllvm/PassWrapper.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
-index 90d24d20737db..9e8614e3b6d34 100644
---- a/src/rustllvm/PassWrapper.cpp
-+++ b/src/rustllvm/PassWrapper.cpp
-@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() {
- }
-
- extern "C" void LLVMTimeTraceProfilerInitialize() {
--#if LLVM_VERSION_GE(9, 0)
-+#if LLVM_VERSION_GE(10, 0)
-+ timeTraceProfilerInitialize(
-+ /* TimeTraceGranularity */ 0,
-+ /* ProcName */ "rustc");
-+#elif LLVM_VERSION_GE(9, 0)
- timeTraceProfilerInitialize();
- #endif
- }
diff --git a/community/rust/alpine-move-py-scripts-to-share.patch b/community/rust/alpine-move-py-scripts-to-share.patch
index 44d3320b39..62ef9de2e1 100644
--- a/community/rust/alpine-move-py-scripts-to-share.patch
+++ b/community/rust/alpine-move-py-scripts-to-share.patch
@@ -1,14 +1,15 @@
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
-@@ -14,7 +14,7 @@
+@@ -12,7 +12,7 @@
# Find out where the pretty printer Python module is
- RUSTC_SYSROOT=`rustc --print=sysroot`
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc"
# Run GDB with the additional arguments that load the pretty printers
# Set the environment variable `RUST_GDB` to overwrite the call to a
+ # 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 @@
diff --git a/community/rust/musl-fix-static-linking.patch b/community/rust/musl-fix-static-linking.patch
index 74e9e1e1b1..0f9ee4db90 100644
--- a/community/rust/musl-fix-static-linking.patch
+++ b/community/rust/musl-fix-static-linking.patch
@@ -40,7 +40,7 @@ index e3d297e7862..974e8c0239b 100644
+ // dylibs at all. Force native libraries to be static, even if for example
+ // an upstream rlib was originally linked against a native shared library.
+ if crate_type == config::CrateType::Executable
-+ && sess.crt_static()
++ && sess.crt_static(None)
+ && !sess.target.target.options.crt_static_allows_dylibs
+ {
+ cmd.link_staticlib(name)
diff --git a/community/rust/need-rpath.patch b/community/rust/need-rpath.patch
index 1ec60098db..d10b127033 100644
--- a/community/rust/need-rpath.patch
+++ b/community/rust/need-rpath.patch
@@ -55,7 +55,7 @@ Hacky hacky!
- if sess.opts.cg.rpath {
+ // XXX: hacky hacky
+ let bootstrap = env::var("RUSTC_BOOTSTRAP").is_ok();
-+ if !bootstrap && !sess.crt_static() &&
++ if !bootstrap && !sess.crt_static(None) &&
+ (sess.opts.cg.rpath || sess.target.target.options.need_rpath) {
let target_triple = sess.opts.target_triple.triple();
let mut get_install_prefix_lib_path = || {
diff --git a/community/rust/python3.patch b/community/rust/python3.patch
deleted file mode 100644
index 5a9a53dec6..0000000000
--- a/community/rust/python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure b/configure
-index eeb8d08..81e2001 100755
---- a/configure
-+++ b/configure
-@@ -11,6 +11,7 @@ try() {
- fi
- }
-
-+try python3 "$@"
- try python2.7 "$@"
- try python27 "$@"
- try python2 "$@"
diff --git a/community/rust/static-pie.patch b/community/rust/static-pie.patch
index 4d0021aba5..d12f69b136 100644
--- a/community/rust/static-pie.patch
+++ b/community/rust/static-pie.patch
@@ -74,19 +74,19 @@ library, just like static binaries, but more secure.
post_link_objects: Vec::new(),
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
-@@ -1058,12 +1058,7 @@
- let mut position_independent_executable = false;
+@@ -1350,12 +1350,7 @@
+ }
- if t.options.position_independent_executables {
-- let empty_vec = Vec::new();
-- let args = sess.opts.cg.link_args.as_ref().unwrap_or(&empty_vec);
-- let more_args = &sess.opts.cg.link_arg;
-- let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter());
--
-- if is_pic(sess) && !sess.crt_static() && !args.any(|x| *x == "-static") {
-+ if is_pic(sess) && (!sess.crt_static() || t.options.static_position_independent_executables) {
- position_independent_executable = true;
- }
+ if sess.target.target.options.position_independent_executables {
+- let attr_link_args = &*codegen_results.crate_info.link_args;
+- let mut user_defined_link_args = sess.opts.cg.link_args.iter().chain(attr_link_args);
+- if is_pic(sess)
+- && !sess.crt_static(Some(crate_type))
+- && !user_defined_link_args.any(|x| x == "-static")
+- {
++ if is_pic(sess) && (!sess.crt_static(Some(crate_type)) || sess.target.target.options.static_position_independent_executables) {
+ cmd.position_independent_executable();
+ return;
}
--- a/src/librustc_target/spec/mod.rs
+++ b/src/librustc_target/spec/mod.rs