rpms/llvm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add missing requires

Browse Source 
Make the following changes:
 * Fix a number of `%{?isa}` to use `%{?_isa}` instead.
 * Change all `= %{version}` requires to `= %{version}-%{release}`.
   We were mostly already doing this, but missed some places.
 * Add explicit lld-libs -> llvm-libs and lldb -> clang-libs
   dependencies.
 * Fix libomp-devel -> libomp dependency (it was accidentally
   using libomp-devel -> llvm instead).

Related: RHEL-57454
This commit is contained in:
Nikita Popov 2024-10-14 10:42:34 +02:00
parent 7df3b88c87
commit a3d3baab55
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm.spec
View File

@ -177,7 +177,7 @@
#region main package #region main package
Name: %{pkg_name_llvm} Name: %{pkg_name_llvm}
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
Release: 4%{?dist} Release: 5%{?dist}
Summary: The Low Level Virtual Machine Summary: The Low Level Virtual Machine
License: Apache-2.0 WITH LLVM-exception OR NCSA License: Apache-2.0 WITH LLVM-exception OR NCSA
@ -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}
@ -653,6 +653,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.
@ -662,9 +664,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.
@ -678,6 +680,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}
@ -2375,6 +2378,9 @@ fi
#region changelog #region changelog
%changelog %changelog
* Mon Oct 14 2024 Nikita Popov <npopov@redhat.com> - 19.1.1-5
- Add missing requires
* Fri Oct 11 2024 Nikita Popov <npopov@redhat.com> - 19.1.1-4 * Fri Oct 11 2024 Nikita Popov <npopov@redhat.com> - 19.1.1-4
- Update openmp patch - Update openmp patch