From 9e21675449345c3cf58c36945d1027c05573fe17 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 16 May 2025 03:38:37 +0000 Subject: [PATCH] fix syntax error for rust (cherry picked from commit 489a691dd0c29181aa748aea5ef824fa4643f4ca) --- rust.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rust.spec b/rust.spec index fd29f4b..c2b5c6e 100644 --- a/rust.spec +++ b/rust.spec @@ -4,7 +4,7 @@ %global bootstrap_date 2025-02-20 %global bootstrap_arches x86_64 aarch64 riscv64 loongarch64 %bcond_with llvm_static -%ifarch x86_64 aarch64 riscv64 +%ifarch x86_64 aarch64 riscv64 loongarch64 %bcond_with bundled_llvm %else %bcond_without bundled_llvm @@ -26,7 +26,7 @@ Name: rust Version: 1.86.0 -Release: 2 +Release: 3 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -121,7 +121,7 @@ BuildRequires: cmake >= 3.5.1 %global llvm_root %{_libdir}/%{llvm} %else # default llvm is decent enough on riscv64 -%ifarch x86_64 aarch64 riscv64 +%ifarch x86_64 aarch64 riscv64 loongarch64 %global llvm llvm-toolset-18-llvm %global llvm_root /opt/openEuler/llvm-toolset-18/root%{_prefix} %global clang_maj_ver 18 @@ -356,7 +356,7 @@ fi %ifarch ppc64le %global _arch powerpc64le %endif -%if %{?clang_maj_ver} >= 17 +%if 0%{?clang_maj_ver} >= 17 # This is the new one, used on openEuler 24.03 LTS or later %define profiler %(echo %{llvm_root}/%{_lib}/clang/%{clang_maj_ver}/lib/%{_arch}-%{_vendor}-linux-gnu/libclang_rt.profile.a) %else @@ -563,6 +563,10 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Fri May 16 2025 Wenlong Zhang - 1.86.0-3 +- fix syntax error for rust +- fix build error for loongarch64 + * Wed May 07 2025 wangkai <13474090681@163.com> - 1.86.0-2 - Include all sources in the source package -- Gitee