From dfc9eef042643496ed756b79ab0c0f71b56f92ff Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 23 Nov 2024 20:59:23 -0800 Subject: [PATCH] Use gcc-toolset-14 as the default gcc installation Resolves: RHEL-38233 --- llvm.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index ef27cab..fd0dee3 100644 --- a/llvm.spec +++ b/llvm.spec @@ -56,6 +56,10 @@ # See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros %global toolchain clang +%if %{defined rhel} && 0%{?rhel} < 10 +%global gts_version 14 +%endif + # Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer # https://bugzilla.redhat.com/show_bug.cgi?id=2158587 %undefine _include_frame_pointers @@ -177,7 +181,7 @@ #region main package Name: %{pkg_name_llvm} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Low Level Virtual Machine License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -268,6 +272,10 @@ Patch501: 0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch %global __python3 /usr/bin/python3.12 %endif +%if %{defined gts_version} +# Required for 64-bit atomics on i686. +BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel +%endif BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: clang @@ -510,6 +518,9 @@ libomp-devel to enable -fopenmp. %package -n %{pkg_name_clang}-libs Summary: Runtime library for clang Requires: %{pkg_name_clang}-resource-filesystem%{?_isa} = %{version}-%{release} +%if %{defined gts_version} +Requires: gcc-toolset-%{gts_version}-gcc-c++ +%endif Recommends: %{pkg_name_compiler_rt}%{?_isa} = %{version}-%{release} Requires: %{pkg_name_llvm}-libs = %{version}-%{release} # atomic support is not part of compiler-rt @@ -1268,7 +1279,7 @@ echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buil %endif %if %{defined gts_version} -%global cfg_file_content %{cfg_file_content} --gcc-install-dir=/opt/rh/gcc-toolset-%{gts_version}/root/usr +%global cfg_file_content %{cfg_file_content} --gcc-install-dir=/opt/rh/gcc-toolset-%{gts_version}/root/%{_exec_prefix}/lib/gcc/%{_target_cpu}-redhat-linux/%{gts_version} %endif mkdir -p %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/ @@ -2442,6 +2453,9 @@ fi #region changelog %changelog +* Sun Nov 24 2024 Tom Stellard - 19.1.3-3 +- Use gcc-toolset-14 as the default gcc installation + * Fri Nov 22 2024 Tom Stellard - 19.1.3-2 - Default to DWARF-4