From a2c87aa876b3bf931c3a02d7f390fe7ec83deafc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 18 Apr 2023 16:09:56 +0200 Subject: [PATCH] Restore use of gcc-toolset-12 gcc-toolset-13 is not yet available, so stick with gcc-toolset-12 for now. Will be updated during a later rebase. Resolves: #2178739 --- clang.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/clang.spec b/clang.spec index 1a5507e..81b33e2 100644 --- a/clang.spec +++ b/clang.spec @@ -45,7 +45,7 @@ Name: %pkg_name Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A C language family front-end for LLVM License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -194,7 +194,7 @@ libomp-devel to enable -fopenmp. %package libs Summary: Runtime library for clang Requires: %{name}-resource-filesystem%{?_isa} = %{version} -Requires: gcc-toolset-13-gcc-c++ +Requires: gcc-toolset-12-gcc-c++ Recommends: compiler-rt%{?_isa} = %{version} # atomic support is not part of compiler-rt Recommends: libatomic%{?_isa} @@ -425,7 +425,7 @@ mv ../cmake-%{compat_ver}.src ../cmake -DCLANG_DEFAULT_LINKER=lld \ %endif -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 %cmake_build @@ -677,6 +677,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib" %endif %changelog +* Tue Apr 18 2023 Nikita Popov - 16.0.1-2 +- Restore use of gcc-toolset-12 + * Mon Apr 17 2023 Nikita Popov - 16.0.1-1 - Update to LLVM 16.0.1