diff --git a/rust.spec b/rust.spec index 6b12eeb5a2843ce66975aadbb44ae8725a359141..bb328bc95ec1f5c5f98e3314feee187d9b3c2f94 100644 --- a/rust.spec +++ b/rust.spec @@ -12,7 +12,7 @@ Name: rust Version: 1.70.0 -Release: 1 +Release: 2 Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org @@ -23,7 +23,6 @@ Patch0001: rustc-1.70.0-disable-http2.patch Patch0002: clippy-driver-usage-should-user-friendly.patch Patch0003: cargo-help-clippy-should-have-description-to-user.patch Patch0004: fix-a-println-wrong-format.patch -Patch0005: compile-with-llvm-15.patch # By default, rust tries to use "rust-lld" as a linker for WebAssembly. Patch0006: 0001-Use-lld-provided-by-system-for-wasm.patch # Set a substitute-path in rust-gdb for standard library sources. @@ -101,7 +100,7 @@ BuildRequires: cmake >= 2.8.11 %else # default llvm is decent enough on riscv64 %ifnarch riscv64 -%global llvm llvm15 +%global llvm llvm %else %global llvm llvm %endif @@ -257,10 +256,6 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 -# default llvm is decent enough on riscv64 -%ifnarch riscv64 -%patch0005 -p1 -%endif %patch0006 -p1 %patch0007 -p1 %patch0008 -p1 @@ -481,6 +476,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Mon Jul 17 2023 cf-zhao - 1.70.0-2 +- Use llvm package instead of llvm15 + * Mon Jun 05 2023 jchzhou - 1.70.0-1 - Update to 1.70.0 - Fix rotten patch