Date: Sat, 30 Dec 2023 23:42:29 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 685f4d495471 - main - multimedia/rav1e: drop old lang/rust workaround Message-ID: <202312302342.3BUNgTSO056351@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=685f4d4954719ae84917f7c9e91942ea2e6c7b53 commit 685f4d4954719ae84917f7c9e91942ea2e6c7b53 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-12-30 23:35:26 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-12-30 23:39:48 +0000 multimedia/rav1e: drop old lang/rust workaround --- multimedia/rav1e/files/patch-build.rs | 40 ----------------------------------- 1 file changed, 40 deletions(-) diff --git a/multimedia/rav1e/files/patch-build.rs b/multimedia/rav1e/files/patch-build.rs deleted file mode 100644 index 0909154c3e51..000000000000 --- a/multimedia/rav1e/files/patch-build.rs +++ /dev/null @@ -1,40 +0,0 @@ -error: failed to run custom build command for `rav1e v0.4.0 (/wrkdirs/usr/ports/multimedia/librav1e/work/rav1e-0.4.0)` - -Caused by: - process didn't exit successfully: `/wrkdirs/usr/ports/multimedia/librav1e/work/target/release/build/rav1e-b2f4b3ce116fbed0/build-script-build` (exit code: 101) - --- stderr - thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: LlvmVersionError(TooManyComponents)', build.rs:179:16 - stack backtrace: - 0: rust_begin_unwind - 1: core::panicking::panic_fmt - 2: core::result::unwrap_failed - 3: core::result::Result<T,E>::unwrap - at /wrkdirs/usr/ports/lang/rust/work/rustc-1.51.0-src/library/core/src/result.rs:1037:23 - 4: build_script_build::rustc_version_check - at ./build.rs:179:6 - 5: build_script_build::main - at ./build.rs:268:3 - 6: core::ops::function::FnOnce::call_once - at /wrkdirs/usr/ports/lang/rust/work/rustc-1.51.0-src/library/core/src/ops/function.rs:227:5 - note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace. - ---- build.rs.orig 2023-12-30 17:12:06 UTC -+++ build.rs -@@ -236,17 +236,6 @@ fn rustc_version_check() { - } - - fn rustc_version_check() { -- // This should match the version in the CI -- // Make sure to updated README.md when this changes. -- const REQUIRED_VERSION: &str = "1.70.0"; -- if version().unwrap() < Version::parse(REQUIRED_VERSION).unwrap() { -- eprintln!("rav1e requires rustc >= {REQUIRED_VERSION}."); -- exit(1); -- } -- -- if version_meta().unwrap().channel == Channel::Nightly { -- println!("cargo:rustc-cfg=nightly_rustc"); -- } - } - - #[allow(unused_variables)]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312302342.3BUNgTSO056351>