Differential D31872
lang/rust: Update to 1.55.0 Authored by tobik on Sep 7 2021, 11:58 AM. Tags None Referenced Files
Details
Scheduled to be released on 2021-09-09. https://internals.rust-lang.org/t/rust-1-55-0-pre-release-testing/15292
13.0 amd64 Poudriere build ok ref11-i386 ok Exp-run: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258337
Diff Detail
Event TimelineComment Actions Can you update patch-src_llvm-project_compiler-rt_lib_builtins_cpu__model.c with what will probably be committed upstream : https://reviews.llvm.org/D109330 . I've put the updated file on freefall. --- a/lang/rust-bootstrap/Makefile +++ b/lang/rust-bootstrap/Makefile @@ -34,7 +35,6 @@ FLAVORS= aarch64 amd64 armv6 armv7 i386 powerpc64_elfv1 powerpc64_elfv2 \ FLAVOR?= ${FLAVORS:[1]} aarch64_PKGNAMEPREFIX= aarch64- -aarch64_BUILD_DEPENDS= llvm90>0:devel/llvm90 amd64_PKGNAMEPREFIX= amd64- armv6_PKGNAMEPREFIX= armv6- armv7_PKGNAMEPREFIX= armv7- @@ -52,10 +52,6 @@ USE_GCC= 9:build .endif # for openssl-src crate USE_PERL5= build -.if ${FLAVOR} == aarch64 -CC= clang90 -CXX= clang++90 -.endif PATCHDIR= ${.CURDIR}/../rust/files # rustc stashes intermediary files in TMPDIR (default /tmp) which # might cause issues for users that for some reason space limit @@ -114,6 +110,7 @@ _RUST_LLVM_TARGET_powerpc= PowerPC _RUST_LLVM_TRIPLE= ${_RUST_LLVM_TRIPLE_${FLAVOR}:U${_RUST_TARGET}} _RUST_LLVM_TRIPLE_armv6= armv6-gnueabihf-freebsd _RUST_LLVM_TRIPLE_armv7= armv7-gnueabihf-freebsd +_RUST_LLVM_TRIPLE_aarch64= aarch64-unknown-freebsd12.0 _RUST_LLVM_TRIPLE_powerpc= powerpc-unknown-freebsd13.0 # secure-plt .include <bsd.port.pre.mk> Thanks! Comment Actions
Comment Actions Fails to build on powerpc: =>> Status lang/rust | rust-1.55.0: build
=======================<phase: build >============================
===> Building for rust-1.55.0
rustup not detected: [Errno 2] No such file or directory: 'rustc'
falling back to auto-detect
running: /wrkdirs/usr/ports/lang/rust/work/bootstrap/bin/cargo build --manifest-path /wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/src/bootstrap/Cargo.toml --verbose --frozen
Traceback (most recent call last):
File "x.py", line 27, in <module>
bootstrap.main()
File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/src/bootstrap/bootstrap.py", line 1209, in main
bootstrap(help_triggered)
File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/src/bootstrap/bootstrap.py", line 1180, in bootstrap
build.build_bootstrap()
File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/src/bootstrap/bootstrap.py", line 936, in build_bootstrap
run(args, env=env, verbose=self.verbose)
File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/src/bootstrap/bootstrap.py", line 153, in run
raise RuntimeError(err)
RuntimeError: failed to run: /wrkdirs/usr/ports/lang/rust/work/bootstrap/bin/cargo build --manifest-path /wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/src/bootstrap/Cargo.toml --verbose --frozen
*** Error code 1Comment Actions Any idea what could be broken? The bootstrap compiler passes a simple smoke test for me (in a ppc jail in a qemu-system-ppc64 vm; all on FreeBSD 13.0-RELEASE). I can build and run a simple hello panic program. Does this work for you? Comment Actions Yes. root@powerpc-130-rust:~ # vi hello.rs root@powerpc-130-rust:~ # /wrkdirs/usr/ports/lang/rust/work/bootstrap/bin/rustc hello.rs root@powerpc-130-rust:~ # ./hello Hello World! I noticed that cargo segfaults: root@powerpc-130-rust:~ # ls /wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/cargo.core /wrkdirs/usr/ports/lang/rust/work/rustc-1.55.0-src/cargo.core pid 61878 (cargo), jid 239, uid 0: exited on signal 11 (core dumped) This is probably the reason why build fails. Comment Actions
I was able to reproduce the cargo crash on powerpc but not sure why Comment Actions Can you change the armv6/7 target triple to this please: --- a/lang/rust-bootstrap/Makefile +++ b/lang/rust-bootstrap/Makefile @@ -112,8 +112,8 @@ _RUST_LLVM_TARGET_powerpc64_elfv2= PowerPC _RUST_LLVM_TARGET_powerpc64le= PowerPC _RUST_LLVM_TARGET_powerpc= PowerPC _RUST_LLVM_TRIPLE= ${_RUST_LLVM_TRIPLE_${FLAVOR}:U${_RUST_TARGET}} -_RUST_LLVM_TRIPLE_armv6= armv6-gnueabihf-freebsd -_RUST_LLVM_TRIPLE_armv7= armv7-gnueabihf-freebsd +_RUST_LLVM_TRIPLE_armv6= armv6-unknown-freebsd12.2-gnueabihf +_RUST_LLVM_TRIPLE_armv7= armv7-unknown-freebsd12.2-gnueabihf _RUST_LLVM_TRIPLE_powerpc= powerpc-unknown-freebsd13.0 # secure-plt .include <bsd.port.pre.mk> Comment Actions @mikael Should I update the armv7 bootstrap with the new ones from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257419#c25 ? | ||||||||||||||||||||||||||||||||||||||||||||