From 5e4b041024a9e207740ac0e6b1ad90ffa26dda23 Mon Sep 17 00:00:00 2001 From: liyunfei Date: Tue, 15 Apr 2025 19:00:10 +0800 Subject: [PATCH] fix package name for sys llvm --- llvm.spec | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index f8f4ca9..2565cab 100644 --- a/llvm.spec +++ b/llvm.spec @@ -144,9 +144,13 @@ #region packages #region main package +%if %{with sys_llvm} +Name: llvm +%else Name: llvm-toolset-%{maj_ver} +%endif Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 30 +Release: 31 Summary: The Low Level Virtual Machine License: NCSA @@ -243,6 +247,7 @@ BuildRequires: graphviz # This is required because we need "ps" when running LLDB tests BuildRequires: procps-ng +%if %{without sys_llvm} Requires: %{pkg_name_llvm} = %{version}-%{release} Requires: %{pkg_name_clang} = %{version}-%{release} Requires: %{pkg_name_lld} = %{version}-%{release} @@ -252,10 +257,22 @@ LLVM is a compiler infrastructure designed for compile-time, link-time, runtime, and idle-time optimization of programs from arbitrary programming languages. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality. +%else +Requires: %{pkg_name_llvm}-libs%{?_isa} = %{version}-%{release} + +Provides: llvm(major) = %{maj_ver} + +%description -n %{pkg_name_llvm} +LLVM is a compiler infrastructure designed for compile-time, link-time, +runtime, and idle-time optimization of programs from arbitrary programming +languages. The compiler infrastructure includes mirror sets of programming +tools as well as libraries with equivalent functionality. +%endif #endregion main package #region LLVM packages +%if %{without sys_llvm} %package -n %{pkg_name_llvm} Summary: The Low Level Virtual Machine @@ -268,6 +285,7 @@ LLVM is a compiler infrastructure designed for compile-time, link-time, runtime, and idle-time optimization of programs from arbitrary programming languages. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality. +%endif %package -n %{pkg_name_llvm}-devel Summary: Libraries and header files for LLVM @@ -2813,6 +2831,9 @@ fi #endregion files %changelog +* Tue Apr 15 2025 liyunfei - 17.0.6-31 +- fix package name for sys_llvm + * Wed Apr 09 2025 liyunfei - 17.0.6-30 - Spec file merge for sys_llvm -- Gitee