Use gcc_major instead of hardcoding

Resolves: RHEL-11600
This commit is contained in:
Marek Polacek 2024-01-31 12:28:48 -05:00
parent 8fb03c552f
commit 05aecf1978

View File

@ -146,7 +146,7 @@ BuildRequires: scl-utils-build
%else %else
%global build_annobin_plugin 0 %global build_annobin_plugin 0
%endif %endif
Summary: GCC version 13 Summary: GCC version %{gcc_major}
Name: %{?scl_prefix}gcc Name: %{?scl_prefix}gcc
Version: %{gcc_version} Version: %{gcc_version}
Release: %{gcc_release}.2%{?dist} Release: %{gcc_release}.2%{?dist}
@ -392,10 +392,11 @@ Patch3024: gcc13-testsuite-aarch64-add-fno-stack-protector.patch
%endif %endif
%description %description
The %{?scl_prefix}gcc%{!?scl:13} package contains the GNU Compiler Collection version 10. The %{?scl_prefix}gcc%{!?scl:13} package contains the GNU Compiler Collection
version %{gcc_major}.
%package -n libgcc %package -n libgcc
Summary: GCC version 13 shared support library Summary: GCC version %{gcc_major} shared support library
Autoreq: false Autoreq: false
%description -n libgcc %description -n libgcc
@ -403,7 +404,7 @@ This package contains GCC shared support library which is needed
e.g. for exception handling support. e.g. for exception handling support.
%package c++ %package c++
Summary: C++ support for GCC version 13 Summary: C++ support for GCC version %{gcc_major}
Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release} Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release}
Requires: libstdc++ Requires: libstdc++
Requires: %{?scl_prefix}libstdc++%{!?scl:13}-devel = %{version}-%{release} Requires: %{?scl_prefix}libstdc++%{!?scl:13}-devel = %{version}-%{release}
@ -411,8 +412,8 @@ Autoreq: true
%description c++ %description c++
This package adds C++ support to the GNU Compiler Collection This package adds C++ support to the GNU Compiler Collection
version 13. It includes support for most of the current C++ specification version %{gcc_major}. It includes support for most of the current C++
and a lot of support for the upcoming C++ specification. specification and a lot of support for the upcoming C++ specification.
%package -n libstdc++ %package -n libstdc++
Summary: GNU Standard C++ Library Summary: GNU Standard C++ Library
@ -442,7 +443,7 @@ Manual, doxygen generated API information and Frequently Asked Questions
for the GNU standard C++ library. for the GNU standard C++ library.
%package gfortran %package gfortran
Summary: Fortran support for GCC 13 Summary: Fortran support for GCC %{gcc_major}
Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release} Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release}
%if 0%{?rhel} > 7 %if 0%{?rhel} > 7
Requires: libgfortran >= 8.1.1 Requires: libgfortran >= 8.1.1
@ -465,18 +466,18 @@ programs with the GNU Compiler Collection.
%package gdb-plugin %package gdb-plugin
Summary: GCC 13 plugin for GDB Summary: GCC %{gcc_major} plugin for GDB
Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release} Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release}
%description gdb-plugin %description gdb-plugin
This package contains GCC 13 plugin for GDB C expression evaluation. This package contains GCC %{gcc_major} plugin for GDB C expression evaluation.
%package -n %{?scl_prefix}libgccjit %package -n %{?scl_prefix}libgccjit
Summary: Library for embedding GCC inside programs and libraries Summary: Library for embedding GCC inside programs and libraries
Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release} Requires: %{?scl_prefix}gcc%{!?scl:13} = %{version}-%{release}
%description -n %{?scl_prefix}libgccjit %description -n %{?scl_prefix}libgccjit
This package contains shared library with GCC 13 JIT front-end. This package contains shared library with GCC %{gcc_major} JIT front-end.
%package -n %{?scl_prefix}libgccjit-devel %package -n %{?scl_prefix}libgccjit-devel
Summary: Support for embedding GCC inside programs and libraries Summary: Support for embedding GCC inside programs and libraries
@ -486,7 +487,7 @@ Requires: %{?scl_prefix}libgccjit = %{version}-%{release}
#Requires: %%{?scl_prefix}libgccjit-docs = %%{version}-%%{release} #Requires: %%{?scl_prefix}libgccjit-docs = %%{version}-%%{release}
%description -n %{?scl_prefix}libgccjit-devel %description -n %{?scl_prefix}libgccjit-devel
This package contains header files for GCC 13 JIT front end. This package contains header files for GCC %{gcc_major} JIT front end.
%package -n %{?scl_prefix}libgccjit-docs %package -n %{?scl_prefix}libgccjit-docs
Summary: Documentation for embedding GCC inside programs and libraries Summary: Documentation for embedding GCC inside programs and libraries
@ -500,10 +501,10 @@ Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
%description -n %{?scl_prefix}libgccjit-docs %description -n %{?scl_prefix}libgccjit-docs
This package contains documentation for GCC 13 JIT front-end. This package contains documentation for GCC %{gcc_major} JIT front-end.
%package -n libquadmath %package -n libquadmath
Summary: GCC 13 __float128 shared support library Summary: GCC %{gcc_major} __float128 shared support library
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
@ -512,7 +513,7 @@ This package contains GCC shared support library which is needed
for __float128 math support and for Fortran REAL*16 support. for __float128 math support and for Fortran REAL*16 support.
%package -n %{?scl_prefix}libquadmath-devel %package -n %{?scl_prefix}libquadmath-devel
Summary: GCC 13 __float128 support Summary: GCC %{gcc_major} __float128 support
Group: Development/Libraries Group: Development/Libraries
%if 0%{!?scl:1} %if 0%{!?scl:1}
Requires: %{?scl_prefix}libquadmath%{_isa} = %{version}-%{release} Requires: %{?scl_prefix}libquadmath%{_isa} = %{version}-%{release}
@ -553,7 +554,7 @@ Requires: libmpc-devel >= 0.8.1
%description plugin-devel %description plugin-devel
This package contains header files and other support files This package contains header files and other support files
for compiling GCC 13 plugins. The GCC plugin ABI is currently for compiling GCC %{gcc_major} plugins. The GCC plugin ABI is currently
not stable, so plugins must be rebuilt any time GCC is updated. not stable, so plugins must be rebuilt any time GCC is updated.
%package -n libatomic %package -n libatomic
@ -575,10 +576,10 @@ Requires: libatomic%{_isa} >= 4.8.0
This package contains GNU Atomic static libraries. This package contains GNU Atomic static libraries.
%package -n libasan8 %package -n libasan8
Summary: The Address Sanitizer runtime library from GCC 13 Summary: The Address Sanitizer runtime library from GCC %{gcc_major}
%description -n libasan8 %description -n libasan8
This package contains the Address Sanitizer library from GCC 13 This package contains the Address Sanitizer library from GCC %{gcc_major}
which is used for -fsanitize=address instrumented programs. which is used for -fsanitize=address instrumented programs.
%package -n %{?scl_prefix}libasan-devel %package -n %{?scl_prefix}libasan-devel