rpms/llvm
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-11-24 09:32:42 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

Backport requires fixes from RHEL 10

Browse source 
Make the following changes:
 * Fix a number of `%{?isa}` to use `%{?_isa}` instead.
 * Add explicit lld-libs -> llvm-libs and lldb -> clang-libs
   dependencies (to satisfy rpminspect rpmdeps analysis).
 * Fix libomp-devel -> libomp dependency (it was accidentally
   using libomp-devel -> llvm instead).
 * Change all `= %{version}` requires to `= %{version}-%{release}`.
   We were mostly already doing this, but missed some places.
This commit is contained in:
Nikita Popov 2024-10-14 10:42:34 +02:00
parent 71b35f8e70
commit de0bfe9a28
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
llvm.spec
View file

@ -481,15 +481,15 @@ libomp-devel to enable -fopenmp.
%package -n %{pkg_name_clang}-libs %package -n %{pkg_name_clang}-libs
Summary: Runtime library for clang Summary: Runtime library for clang
Requires: %{pkg_name_clang}-resource-filesystem%{?_isa} = %{version} Requires: %{pkg_name_clang}-resource-filesystem%{?_isa} = %{version}-%{release}
Recommends: %{pkg_name_compiler_rt}%{?_isa} = %{version} Recommends: %{pkg_name_compiler_rt}%{?_isa} = %{version}-%{release}
Requires: %{pkg_name_llvm}-libs = %{version} Requires: %{pkg_name_llvm}-libs = %{version}-%{release}
# atomic support is not part of compiler-rt # atomic support is not part of compiler-rt
Recommends: libatomic%{?_isa} Recommends: libatomic%{?_isa}
# libomp-devel is required, so clang can find the omp.h header when compiling # libomp-devel is required, so clang can find the omp.h header when compiling
# with -fopenmp. # with -fopenmp.
Recommends: %{pkg_name_libomp}-devel%{_isa} = %{version} Recommends: %{pkg_name_libomp}-devel%{_isa} = %{version}-%{release}
Recommends: %{pkg_name_libomp}%{_isa} = %{version} Recommends: %{pkg_name_libomp}%{_isa} = %{version}-%{release}
%description -n %{pkg_name_clang}-libs %description -n %{pkg_name_clang}-libs
Runtime library for clang. Runtime library for clang.
@ -582,7 +582,7 @@ Summary: LLVM "compiler-rt" runtime libraries
License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
Requires: clang-resource-filesystem%{?isa} = %{version} Requires: clang-resource-filesystem%{?_isa} = %{version}-%{release}
Provides: compiler-rt(major) = %{maj_ver} Provides: compiler-rt(major) = %{maj_ver}
%description -n %{pkg_name_compiler_rt} %description -n %{pkg_name_compiler_rt}
@ -600,7 +600,7 @@ Summary: OpenMP runtime for clang
URL: http://openmp.llvm.org URL: http://openmp.llvm.org
Requires: elfutils-libelf%{?isa} Requires: elfutils-libelf%{?_isa}
Provides: libomp(major) = %{maj_ver} Provides: libomp(major) = %{maj_ver}
@ -612,8 +612,8 @@ Summary: OpenMP header files
URL: http://openmp.llvm.org URL: http://openmp.llvm.org
Requires: %{name}%{?isa} = %{version}-%{release} Requires: %{pkg_name_libomp}%{?_isa} = %{version}-%{release}
Requires: clang-resource-filesystem%{?isa} = %{version} Requires: clang-resource-filesystem%{?_isa} = %{version}-%{release}
Provides: libomp-devel(major) = %{maj_ver} Provides: libomp-devel(major) = %{maj_ver}
@ -654,6 +654,8 @@ programs that use the LLD infrastructure.
%package -n %{pkg_name_lld}-libs %package -n %{pkg_name_lld}-libs
Summary: LLD shared libraries Summary: LLD shared libraries
Requires: %{pkg_name_llvm}-libs%{?_isa} = %{version}-%{release}
%description -n %{pkg_name_lld}-libs %description -n %{pkg_name_lld}-libs
Shared libraries for LLD. Shared libraries for LLD.
@ -663,9 +665,9 @@ Shared libraries for LLD.
%if 0%{?rhel} %if 0%{?rhel}
%package -n %{pkg_name_llvm}-toolset %package -n %{pkg_name_llvm}-toolset
Summary: Package that installs llvm-toolset Summary: Package that installs llvm-toolset
Requires: clang = %{version} Requires: clang = %{version}-%{release}
Requires: llvm = %{version} Requires: llvm = %{version}-%{release}
Requires: lld = %{version} Requires: lld = %{version}-%{release}
%description -n %{pkg_name_llvm}-toolset %description -n %{pkg_name_llvm}-toolset
This is the main package for llvm-toolset. This is the main package for llvm-toolset.
@ -679,6 +681,7 @@ Summary: Next generation high-performance debugger
License: Apache-2.0 WITH LLVM-exception OR NCSA License: Apache-2.0 WITH LLVM-exception OR NCSA
URL: http://lldb.llvm.org/ URL: http://lldb.llvm.org/
Requires: %{pkg_name_clang}-libs%{?_isa} = %{version}-%{release}
Requires: python%{python3_pkgversion}-lldb Requires: python%{python3_pkgversion}-lldb
%description -n %{pkg_name_lldb} %description -n %{pkg_name_lldb}