rpms/clang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore use of gcc-toolset-12

Browse Source 
gcc-toolset-13 is not yet available, so stick with gcc-toolset-12
for now. Will be updated during a later rebase.

Resolves: #2178739
This commit is contained in:
Nikita Popov 2023-04-18 16:09:56 +02:00
parent 8ffdcd4aff
commit a2c87aa876
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang.spec
View File

@ -45,7 +45,7 @@
Name: %pkg_name Name: %pkg_name
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
Release: 1%{?dist} Release: 2%{?dist}
Summary: A C language family front-end for LLVM Summary: A C language family front-end for LLVM
License: Apache-2.0 WITH LLVM-exception OR NCSA License: Apache-2.0 WITH LLVM-exception OR NCSA
@ -194,7 +194,7 @@ libomp-devel to enable -fopenmp.
%package libs %package libs
Summary: Runtime library for clang Summary: Runtime library for clang
Requires: %{name}-resource-filesystem%{?_isa} = %{version} Requires: %{name}-resource-filesystem%{?_isa} = %{version}
Requires: gcc-toolset-13-gcc-c++ Requires: gcc-toolset-12-gcc-c++
Recommends: compiler-rt%{?_isa} = %{version} Recommends: compiler-rt%{?_isa} = %{version}
# atomic support is not part of compiler-rt # atomic support is not part of compiler-rt
Recommends: libatomic%{?_isa} Recommends: libatomic%{?_isa}
@ -425,7 +425,7 @@ mv ../cmake-%{compat_ver}.src ../cmake
-DCLANG_DEFAULT_LINKER=lld \ -DCLANG_DEFAULT_LINKER=lld \
%endif %endif
-DCLANG_DEFAULT_UNWINDLIB=libgcc \ -DCLANG_DEFAULT_UNWINDLIB=libgcc \
-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-13/root/usr \ -DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-12/root/usr \
-DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF
%cmake_build %cmake_build
@ -677,6 +677,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
%endif %endif
%changelog %changelog
* Tue Apr 18 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-2
- Restore use of gcc-toolset-12
* Mon Apr 17 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-1 * Mon Apr 17 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-1
- Update to LLVM 16.0.1 - Update to LLVM 16.0.1