cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang/rust: update to 1.50.0

Browse Source 
Announce: https://blog.rust-lang.org/2021/02/11/Rust-1.50.0.html
ChangeLog: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1500-2021-02-11
This commit is contained in:
semarie 2021-02-13 18:31:24 +00:00
parent 161f0a5a4b
commit 67775d51fc
12 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lang/rust/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.123 2021/01/01 09:02:54 semarie Exp $ # $OpenBSD: Makefile,v 1.124 2021/02/13 18:31:24 semarie Exp $
ONLY_FOR_ARCHS = ${RUST_ARCHS} ONLY_FOR_ARCHS = ${RUST_ARCHS}
@ -13,14 +13,14 @@ COMMENT-gdb = Rust debugger through gdb
COMMENT-clippy = Rust linter COMMENT-clippy = Rust linter
COMMENT-rustfmt = Rust code formatter COMMENT-rustfmt = Rust code formatter
V = 1.49.0 V = 1.50.0
DISTNAME = rustc-${V}-src DISTNAME = rustc-${V}-src
# rustc bootstrap version # rustc bootstrap version
BV-aarch64 = 1.49.0-20201231 BV-aarch64 = 1.50.0-20210212
BV-amd64 = 1.49.0-20201230 BV-amd64 = 1.50.0-20210210
BV-i386 = 1.49.0-20201230 BV-i386 = 1.50.0-20210210
BV-sparc64 = 1.49.0-20201231 BV-sparc64 = 1.50.0-20210210
BV = ${BV-${MACHINE_ARCH}} BV = ${BV-${MACHINE_ARCH}}
PKGNAME = rust-${V} PKGNAME = rust-${V}
@ -92,12 +92,13 @@ LIBRUST_WITH_HASHES = addr2line 01 \
rustc_std_workspace_alloc 14 \ rustc_std_workspace_alloc 14 \
rustc_std_workspace_core 15 \ rustc_std_workspace_core 15 \
rustc_std_workspace_std 16 \ rustc_std_workspace_std 16 \
std 17 \ serde_derive 17 \
term 18 \ std 18 \
test 19 \ term 19 \
tracing_attributes 20 \ test 20 \
unicode_width 21 \ tracing_attributes 21 \
unwind 22 unicode_width 22 \
unwind 23
# generate a stable hash mostly conforming to rust expectations # generate a stable hash mostly conforming to rust expectations
# (it should change if anything changed) # (it should change if anything changed)

20
lang/rust/distinfo
View File

@ -1,10 +1,10 @@
SHA256 (rust/rustc-1.49.0-src.tar.xz) = 6+kQ7cgkoKA3oQvkQ0RqBRGSO6g0L6PDMeyKIkgdXRU= SHA256 (rust/rustc-1.50.0-src.tar.xz) = 9UrfkgTtPLOZjNwbqlZFs0bYz48YIF47FfyuGUulRXw=
SHA256 (rust/rustc-bootstrap-aarch64-1.49.0-20201231.tar.xz) = 9Yd0r7apo+vdL5x4q5/JCOnpK1jU5ELy6XpMzR1vxWs= SHA256 (rust/rustc-bootstrap-aarch64-1.50.0-20210212.tar.xz) = fNrZWMbwMkdWv0AP/YrcGEXc5jIjQTT7O2hYTrOoR0M=
SHA256 (rust/rustc-bootstrap-amd64-1.49.0-20201230.tar.xz) = 6z6Gq+d46gNcuMEambhpmD2o0Rt6oUAkarEqIfhI8+w= SHA256 (rust/rustc-bootstrap-amd64-1.50.0-20210210.tar.xz) = IOb8DfnyowVnASms6s3qSvU/SqlOnKRkYE4iusA0S18=
SHA256 (rust/rustc-bootstrap-i386-1.49.0-20201230.tar.xz) = KudYIE1GmY1/CD3lNUcZH5Pyqx3r3lpf0FNF8UnZId0= SHA256 (rust/rustc-bootstrap-i386-1.50.0-20210210.tar.xz) = SzLVLgu3pAo2rzAC7+GcYuIxOJlTwKerGi/AJjHCya0=
SHA256 (rust/rustc-bootstrap-sparc64-1.49.0-20201231.tar.xz) = WyfbovItm+WlyuUD3vKmvXwl5Vtf4UK9gjunZ4rh+Ho= SHA256 (rust/rustc-bootstrap-sparc64-1.50.0-20210210.tar.xz) = TZ9sTGvscAeW4I0XJM3FGYlVneVbYbUywjYEagJ4ueI=
SIZE (rust/rustc-1.49.0-src.tar.xz) = 108330280 SIZE (rust/rustc-1.50.0-src.tar.xz) = 108666272
SIZE (rust/rustc-bootstrap-aarch64-1.49.0-20201231.tar.xz) = 52055668 SIZE (rust/rustc-bootstrap-aarch64-1.50.0-20210212.tar.xz) = 53330812
SIZE (rust/rustc-bootstrap-amd64-1.49.0-20201230.tar.xz) = 61228012 SIZE (rust/rustc-bootstrap-amd64-1.50.0-20210210.tar.xz) = 64297640
SIZE (rust/rustc-bootstrap-i386-1.49.0-20201230.tar.xz) = 61187824 SIZE (rust/rustc-bootstrap-i386-1.50.0-20210210.tar.xz) = 65146452
SIZE (rust/rustc-bootstrap-sparc64-1.49.0-20201231.tar.xz) = 72319372 SIZE (rust/rustc-bootstrap-sparc64-1.50.0-20210210.tar.xz) = 78527792

4
lang/rust/patches/patch-src_bootstrap_bootstrap_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_bootstrap_bootstrap_py,v 1.10 2021/01/01 09:02:54 semarie Exp $ $OpenBSD: patch-src_bootstrap_bootstrap_py,v 1.11 2021/02/13 18:31:24 semarie Exp $
Workaround for sparc64: bootstrap segfaults without -O3 Workaround for sparc64: bootstrap segfaults without -O3
Index: src/bootstrap/bootstrap.py Index: src/bootstrap/bootstrap.py
--- src/bootstrap/bootstrap.py.orig --- src/bootstrap/bootstrap.py.orig
+++ src/bootstrap/bootstrap.py +++ src/bootstrap/bootstrap.py
@@ -806,6 +806,9 @@ class RustBuild(object): @@ -810,6 +810,9 @@ class RustBuild(object):
if self.get_toml("deny-warnings", "rust") != "false": if self.get_toml("deny-warnings", "rust") != "false":
env["RUSTFLAGS"] += " -Dwarnings" env["RUSTFLAGS"] += " -Dwarnings"

4
lang/rust/patches/patch-src_bootstrap_builder_rs
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_bootstrap_builder_rs,v 1.15 2021/01/01 09:02:54 semarie Exp $ $OpenBSD: patch-src_bootstrap_builder_rs,v 1.16 2021/02/13 18:31:24 semarie Exp $
Pass the information that we want to override metadata (on final stage) Pass the information that we want to override metadata (on final stage)
Index: src/bootstrap/builder.rs Index: src/bootstrap/builder.rs
--- src/bootstrap/builder.rs.orig --- src/bootstrap/builder.rs.orig
+++ src/bootstrap/builder.rs +++ src/bootstrap/builder.rs
@@ -1303,6 +1303,28 @@ impl<'a> Builder<'a> { @@ -1333,6 +1333,28 @@ impl<'a> Builder<'a> {
); );
} }

4
lang/rust/patches/patch-src_bootstrap_config_rs
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_bootstrap_config_rs,v 1.1 2021/01/06 18:48:25 semarie Exp $ $OpenBSD: patch-src_bootstrap_config_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $
Override initial_cargo value to use ".../cargo" instead of the Override initial_cargo value to use ".../cargo" instead of the
executable path as returned by env::current_exe() to avoid using executable path as returned by env::current_exe() to avoid using
@ -7,7 +7,7 @@ bootstrap binary without the shell wrapper.
Index: src/bootstrap/config.rs Index: src/bootstrap/config.rs
--- src/bootstrap/config.rs.orig --- src/bootstrap/config.rs.orig
+++ src/bootstrap/config.rs +++ src/bootstrap/config.rs
@@ -936,6 +936,9 @@ impl Config { @@ -953,6 +953,9 @@ impl Config {
} }
}); });

4
lang/rust/patches/patch-src_bootstrap_lib_rs
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_bootstrap_lib_rs,v 1.34 2021/01/01 09:02:54 semarie Exp $ $OpenBSD: patch-src_bootstrap_lib_rs,v 1.35 2021/02/13 18:31:24 semarie Exp $
let us compilation choice to be honored. let us compilation choice to be honored.
https://github.com/rust-lang/rust/issues/39900 https://github.com/rust-lang/rust/issues/39900
Index: src/bootstrap/lib.rs Index: src/bootstrap/lib.rs
--- src/bootstrap/lib.rs.orig --- src/bootstrap/lib.rs.orig
+++ src/bootstrap/lib.rs +++ src/bootstrap/lib.rs
@@ -834,7 +834,6 @@ impl Build { @@ -836,7 +836,6 @@ impl Build {
.args() .args()
.iter() .iter()
.map(|s| s.to_string_lossy().into_owned()) .map(|s| s.to_string_lossy().into_owned())

4
lang/rust/patches/patch-src_bootstrap_test_rs
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_bootstrap_test_rs,v 1.15 2021/01/01 09:02:54 semarie Exp $ $OpenBSD: patch-src_bootstrap_test_rs,v 1.16 2021/02/13 18:31:24 semarie Exp $
Disable "Bootstrap" test by default (it requires network). Disable "Bootstrap" test by default (it requires network).
Index: src/bootstrap/test.rs Index: src/bootstrap/test.rs
--- src/bootstrap/test.rs.orig --- src/bootstrap/test.rs.orig
+++ src/bootstrap/test.rs +++ src/bootstrap/test.rs
@@ -2030,7 +2030,7 @@ pub struct Bootstrap; @@ -2014,7 +2014,7 @@ pub struct Bootstrap;
impl Step for Bootstrap { impl Step for Bootstrap {
type Output = (); type Output = ();

16
lang/rust/patches/patch-src_test_ui_abi_stack-probes-lto_rs
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_test_ui_abi_stack-probes-lto_rs,v 1.1 2019/12/10 07:32:42 semarie Exp $ $OpenBSD: patch-src_test_ui_abi_stack-probes-lto_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $
Disable stack-probes test (MAP_STACK terminate the process in a way the testsuite fails). Disable stack-probes test (MAP_STACK terminate the process in a way the testsuite fails).
Index: src/test/ui/abi/stack-probes-lto.rs Index: src/test/ui/abi/stack-probes-lto.rs
--- src/test/ui/abi/stack-probes-lto.rs.orig --- src/test/ui/abi/stack-probes-lto.rs.orig
+++ src/test/ui/abi/stack-probes-lto.rs +++ src/test/ui/abi/stack-probes-lto.rs
@@ -8,6 +8,7 @@ @@ -3,6 +3,7 @@
// ignore-sparc // ignore-aarch64
// ignore-sparc64 // ignore-mips
// ignore-wasm // ignore-mips64
+// ignore-openbsd +// ignore-openbsd
// ignore-cloudabi no processes // ignore-powerpc
// ignore-emscripten no processes // ignore-s390x
// ignore-sgx no processes // ignore-sparc

16
lang/rust/patches/patch-src_test_ui_abi_stack-probes_rs
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_test_ui_abi_stack-probes_rs,v 1.1 2019/12/10 07:32:42 semarie Exp $ $OpenBSD: patch-src_test_ui_abi_stack-probes_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $
Disable stack-probes test (MAP_STACK terminate the process in a way the testsuite fails). Disable stack-probes test (MAP_STACK terminate the process in a way the testsuite fails).
Index: src/test/ui/abi/stack-probes.rs Index: src/test/ui/abi/stack-probes.rs
--- src/test/ui/abi/stack-probes.rs.orig --- src/test/ui/abi/stack-probes.rs.orig
+++ src/test/ui/abi/stack-probes.rs +++ src/test/ui/abi/stack-probes.rs
@@ -8,6 +8,7 @@ @@ -3,6 +3,7 @@
// ignore-sparc // ignore-aarch64
// ignore-sparc64 // ignore-mips
// ignore-wasm // ignore-mips64
+// ignore-openbsd +// ignore-openbsd
// ignore-cloudabi no processes // ignore-powerpc
// ignore-emscripten no processes // ignore-s390x
// ignore-sgx no processes // ignore-sparc

6
lang/rust/patches/patch-src_test_ui_out-of-stack_rs
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_test_ui_out-of-stack_rs,v 1.2 2020/11/05 09:21:34 semarie Exp $ $OpenBSD: patch-src_test_ui_out-of-stack_rs,v 1.3 2021/02/13 18:31:24 semarie Exp $
Index: src/test/ui/out-of-stack.rs Index: src/test/ui/out-of-stack.rs
--- src/test/ui/out-of-stack.rs.orig --- src/test/ui/out-of-stack.rs.orig
+++ src/test/ui/out-of-stack.rs +++ src/test/ui/out-of-stack.rs
@@ -6,6 +6,7 @@ @@ -5,6 +5,7 @@
// ignore-cloudabi no processes // ignore-android: FIXME (#20004)
// ignore-emscripten no processes // ignore-emscripten no processes
// ignore-sgx no processes // ignore-sgx no processes
+// ignore-openbsd +// ignore-openbsd

4
lang/rust/patches/patch-src_test_ui_sse2_rs
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_test_ui_sse2_rs,v 1.1 2019/09/29 08:23:17 semarie Exp $ $OpenBSD: patch-src_test_ui_sse2_rs,v 1.2 2021/02/13 18:31:24 semarie Exp $
Disable SSE2 tests for i386. Disable SSE2 tests for i386.
Index: src/test/ui/sse2.rs Index: src/test/ui/sse2.rs
--- src/test/ui/sse2.rs.orig --- src/test/ui/sse2.rs.orig
+++ src/test/ui/sse2.rs +++ src/test/ui/sse2.rs
@@ -10,7 +10,7 @@ fn main() { @@ -9,7 +9,7 @@ fn main() {
match env::var("TARGET") { match env::var("TARGET") {
Ok(s) => { Ok(s) => {
// Skip this tests on i586-unknown-linux-gnu where sse2 is disabled // Skip this tests on i586-unknown-linux-gnu where sse2 is disabled

6
lang/rust/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.31 2020/11/05 09:21:35 semarie Exp $ @comment $OpenBSD: PLIST-main,v 1.32 2021/02/13 18:31:24 semarie Exp $
@conflict cargo-<0.20.0 @conflict cargo-<0.20.0
@pkgpath devel/cargo @pkgpath devel/cargo
@bin bin/cargo @bin bin/cargo
@ -7,11 +7,14 @@
@so lib/libchalk_derive-${LIBR_METADATA_chalk_derive}.so @so lib/libchalk_derive-${LIBR_METADATA_chalk_derive}.so
@so lib/librustc_driver-${LIBR_METADATA_rustc_driver}.so @so lib/librustc_driver-${LIBR_METADATA_rustc_driver}.so
@so lib/librustc_macros-${LIBR_METADATA_rustc_macros}.so @so lib/librustc_macros-${LIBR_METADATA_rustc_macros}.so
@so lib/libserde_derive-${LIBR_METADATA_serde_derive}.so
@so lib/libstd-${LIBR_METADATA_std}.so @so lib/libstd-${LIBR_METADATA_std}.so
@so lib/libtest-${LIBR_METADATA_test}.so @so lib/libtest-${LIBR_METADATA_test}.so
@so lib/libtracing_attributes-${LIBR_METADATA_tracing_attributes}.so @so lib/libtracing_attributes-${LIBR_METADATA_tracing_attributes}.so
lib/rustlib/ lib/rustlib/
lib/rustlib/${TRIPLE_ARCH}/ lib/rustlib/${TRIPLE_ARCH}/
lib/rustlib/${TRIPLE_ARCH}/bin/
@bin lib/rustlib/${TRIPLE_ARCH}/bin/rust-llvm-dwp
lib/rustlib/${TRIPLE_ARCH}/lib/ lib/rustlib/${TRIPLE_ARCH}/lib/
lib/rustlib/${TRIPLE_ARCH}/lib/libaddr2line-${LIBR_METADATA_addr2line}.rlib lib/rustlib/${TRIPLE_ARCH}/lib/libaddr2line-${LIBR_METADATA_addr2line}.rlib
lib/rustlib/${TRIPLE_ARCH}/lib/libadler-${LIBR_METADATA_adler}.rlib lib/rustlib/${TRIPLE_ARCH}/lib/libadler-${LIBR_METADATA_adler}.rlib
@ -39,6 +42,7 @@ lib/rustlib/${TRIPLE_ARCH}/lib/libtest-${LIBR_METADATA_test}.rlib
@so lib/rustlib/${TRIPLE_ARCH}/lib/libtest-${LIBR_METADATA_test}.so @so lib/rustlib/${TRIPLE_ARCH}/lib/libtest-${LIBR_METADATA_test}.so
lib/rustlib/${TRIPLE_ARCH}/lib/libunicode_width-${LIBR_METADATA_unicode_width}.rlib lib/rustlib/${TRIPLE_ARCH}/lib/libunicode_width-${LIBR_METADATA_unicode_width}.rlib
lib/rustlib/${TRIPLE_ARCH}/lib/libunwind-${LIBR_METADATA_unwind}.rlib lib/rustlib/${TRIPLE_ARCH}/lib/libunwind-${LIBR_METADATA_unwind}.rlib
@bin libexec/cargo-credential-1password
@man man/man1/cargo-bench.1 @man man/man1/cargo-bench.1
@man man/man1/cargo-build.1 @man man/man1/cargo-build.1
@man man/man1/cargo-check.1 @man man/man1/cargo-check.1