aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-09-22 20:13:44 +0000
committerpsykose <alice@ayaya.dev>2022-09-22 23:26:07 +0200
commita3054e4f0c44715619b687fc934fa52256296e68 (patch)
treec41041e3137d5204bea270a8f0eb66aacae99778
parent3f93b16ae7f95f3580b8d5dad589314988ca7f4f (diff)
downloadaports-a3054e4f0c44715619b687fc934fa52256296e68.tar.gz
aports-a3054e4f0c44715619b687fc934fa52256296e68.tar.bz2
aports-a3054e4f0c44715619b687fc934fa52256296e68.tar.xz
community/rust: upgrade to 1.64.0
-rw-r--r--community/rust/APKBUILD38
-rw-r--r--community/rust/riscv64-enotsup.patch12
-rw-r--r--community/rust/s390x-enotsup.patch12
3 files changed, 14 insertions, 48 deletions
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 416065e0ff..ab239d185e 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -5,23 +5,16 @@
# Contributor: Ariadne Conill <ariadne@dereferenced.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=rust
-pkgver=1.63.0
+pkgver=1.64.0
_llvmver=14
-_bootver=1.62.0
+_bootver=1.63.0
pkgrel=0
pkgdesc="The Rust Programming Language"
url="https://www.rust-lang.org/"
-arch="all"
+# riscv64 is broken when compiling itself, and has to be bootstrapped again.
+arch="all !riscv64"
license="Apache-2.0 AND MIT"
-# temporarily pretend this wasn't upgraded to move everything else forward on
-# riscv.
-if [ "$CARCH" = "riscv64" ]; then
- pkgver=1.62.1
- pkgrel=1
- _bootver=1.61.0
-fi
-
# gcc is needed at runtime just for linking. Someday rustc might invoke
# the linker directly, and then we'll only need binutils.
# See: https://github.com/rust-lang/rust/issues/11937
@@ -105,7 +98,6 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz
0001-When-linking-statically-on-musl-based-system-also-li.patch
s390x-enotsup.patch
check-rustc
- riscv64-enotsup.patch
"
builddir="$srcdir/rustc-$pkgver-src"
@@ -137,12 +129,6 @@ ldpath="/$_rlibdir"
export OPENSSL_NO_VENDOR=1
export RUST_BACKTRACE=1
-# absolutely do not set these here, rust "knows" what it's doing
-unset CARGO_PROFILE_RELEASE_LTO
-unset CARGO_PROFILE_RELEASE_OPT_LEVEL
-unset CARGO_PROFILE_RELEASE_PANIC
-unset CARGO_PROFILE_RELEASE_CODEGEN_UNITS
-
# rust checksums files in vendor/, but we have to patch a few files...
_clear_vendor_checksums() {
sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
@@ -153,7 +139,6 @@ prepare() {
# s390x/musl patches
_clear_vendor_checksums libc
- _clear_vendor_checksums libc-0.2.119
}
build() {
@@ -161,6 +146,12 @@ build() {
export PKG_CONFIG_ALLOW_CROSS=1
fi
+ # absolutely do not set these here, rust "knows" what it's doing
+ unset CARGO_PROFILE_RELEASE_LTO
+ unset CARGO_PROFILE_RELEASE_OPT_LEVEL
+ unset CARGO_PROFILE_RELEASE_PANIC
+ unset CARGO_PROFILE_RELEASE_CODEGEN_UNITS
+
./configure \
--build="$_build" \
--host="$_target" \
@@ -176,6 +167,7 @@ build() {
--enable-llvm-link-shared \
--enable-option-checking \
--enable-locked-deps \
+ --enable-profiler \
--enable-vendor \
--dist-compression-formats=gz \
--python="python3" \
@@ -201,8 +193,7 @@ build() {
--set="target.wasm32-unknown-unknown.linker=lld" \
--set="target.wasm32-wasi.sanitizers=false" \
--set="target.wasm32-wasi.profiler=false" \
- --set="target.wasm32-wasi.wasi-root=/usr/share/wasi-sysroot" \
- $profiler
+ --set="target.wasm32-wasi.wasi-root=/usr/share/wasi-sysroot"
# Allow warnings instead of just aborting the build
sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
@@ -401,7 +392,7 @@ _mv() {
}
sha512sums="
-0dd3cd1546bd9c1438afe0c4694e1ed80507f6b437674682c0474e13f83457e9ced4560ddeee58602e01837140f9e34a9e24c6828643dd6f613e07755af6997c rustc-1.63.0-src.tar.xz
+919f40acd8c6eaaef399aa3248503bea19feb96697ab221aaede9ee789ce340b47cb899d1e0e41a31e5d7756653968a10d2faaa4aee83294c9f1243949b43516 rustc-1.64.0-src.tar.xz
cbdb38a2701e079d362e76ff16a2549230f80bcb4dfd3561d240df331fb21d202cb720e18b97fe9b166db1f79b46fab949ce5de5e37af2ed78a10c7fe1dfcfc9 no-export-ld-library-path.patch
cb492d6c619b7d42602d44c8dc5416e83b385d21aa4cf446477fc521ef7ffb0a74dab6d25febe2b64c0ab00528d141d057d10f3e4ff79759d7a0c310c08a7f7e system-wasm-ld.patch
bbb32a20246889b1624b0627f474ada61fc1ba475d09c62f1993c306e7f81b8daa0ca7105d65b74d60ca1b8050a490146dcc81f2bb2cd5952937d962e6b214fc musl-fix-linux_musl_base.patch
@@ -412,7 +403,6 @@ a97bc511a8fd5f71ea7095efa4cf97048badc4ba46d1bde1b7d5ede2879f099157b8b6f5a03278c9
7d59258d4462eba0207739a5c0c8baf1f19d9a396e5547bb4d59d700eb94d50ba6add2e523f3e94e29e993821018594625ea4ac86304fb58f7f8c82622a26ab0 install-template-shebang.patch
7af23c34096f7a03c5a1b40aa07e00dd6193743c872881018a9baa900f240c6e44918e481ab5ed7787a70ef361e4aeec2a7719bcd695f52988262e23271b44e5 do-not-install-libunwind-source.patch
92916225c21742941aaf415d75d330fe2baf77a8226c076e862f4413068d5dee7b08c4b3182f69957ea9a51a0dcde145031565289015b6e3c31894fb396e4eb1 0001-When-linking-statically-on-musl-based-system-also-li.patch
-d5242ed668c6705f92a558d61ce6aa038f28916f2b6bcb85f979afbd255225bcf30875d9d5d6bacceb600d16a72cd3bea8da9eb5fb39e228a201e19b52dd754e s390x-enotsup.patch
+6605f1eb51cafe8eaa9a4fd7196bef5e86169634590e38f20b7c4362f9b755c4841c6fd646f74657a0189bb35822beb1f6cf0ed56d93c15ab9fa4a4f0ad33d3a s390x-enotsup.patch
c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125 check-rustc
-6ce2ff568dbc2d72c36cf14b10f85124d1a59b635caf05242af0850f8f01e483576d4f0d8273d913e28e3541d97875f41345b8523c257e44e0661048eef3e823 riscv64-enotsup.patch
"
diff --git a/community/rust/riscv64-enotsup.patch b/community/rust/riscv64-enotsup.patch
deleted file mode 100644
index 7f5da7da37..0000000000
--- a/community/rust/riscv64-enotsup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vendor/libc-0.2.119/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/vendor/libc-0.2.119/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
-index 5dd34da..df60552 100644
---- a/vendor/libc-0.2.119/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
-+++ b/vendor/libc-0.2.119/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
-@@ -546,6 +546,7 @@ pub const ENOPROTOOPT: ::c_int = 92;
- pub const EPROTONOSUPPORT: ::c_int = 93;
- pub const ESOCKTNOSUPPORT: ::c_int = 94;
- pub const EOPNOTSUPP: ::c_int = 95;
-+pub const ENOTSUP: ::c_int = EOPNOTSUPP;
- pub const EPFNOSUPPORT: ::c_int = 96;
- pub const EAFNOSUPPORT: ::c_int = 97;
- pub const EADDRINUSE: ::c_int = 98;
diff --git a/community/rust/s390x-enotsup.patch b/community/rust/s390x-enotsup.patch
index 8813e9d740..9d94b5bb00 100644
--- a/community/rust/s390x-enotsup.patch
+++ b/community/rust/s390x-enotsup.patch
@@ -1,15 +1,3 @@
-diff --git a/vendor/libc-0.2.116/src/unix/linux_like/linux/musl/b64/s390x.rs b/vendor/libc-0.2.116/src/unix/linux_like/linux/musl/b64/s390x.rs
-index 5fdd03d2c..cb6237abc 100644
---- a/vendor/libc-0.2.119/src/unix/linux_like/linux/musl/b64/s390x.rs
-+++ b/vendor/libc-0.2.119/src/unix/linux_like/linux/musl/b64/s390x.rs
-@@ -221,6 +221,7 @@ pub const ENOPROTOOPT: ::c_int = 92;
- pub const EPROTONOSUPPORT: ::c_int = 93;
- pub const ESOCKTNOSUPPORT: ::c_int = 94;
- pub const EOPNOTSUPP: ::c_int = 95;
-+pub const ENOTSUP: ::c_int = EOPNOTSUPP;
- pub const EPFNOSUPPORT: ::c_int = 96;
- pub const EAFNOSUPPORT: ::c_int = 97;
- pub const ENETDOWN: ::c_int = 100;
diff --git a/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs b/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs
index 5fdd03d2c..cb6237abc 100644
--- a/vendor/libc/src/unix/linux_like/linux/musl/b64/s390x.rs