From 9b763663f6570ce704a04c4062f131b62fdb1a87181ed255bc5c52d7f912a5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 8 Aug 2024 17:24:20 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main gcc revision f7c3529238436bde3d80dbab8a403dcf --- gcc.changes | 16 ++++++++++++++++ gcc.spec | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/gcc.changes b/gcc.changes index 345340e..77d235c 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 7 14:06:50 UTC 2024 - Richard Biener + +- Make gcc-build-fortran provide and conflict gcc-fortran. + +------------------------------------------------------------------- +Thu Aug 1 10:53:40 UTC 2024 - Richard Biener + +- Add libquadmath-devel package for GCC 14. +- Bump GCC version to 14, leave -build flavor at 13. + +------------------------------------------------------------------- +Wed Mar 20 09:48:44 UTC 2024 - Richard Biener + +- Add conflicts where -build variants provide the non-build variant. + ------------------------------------------------------------------- Mon Mar 18 13:47:32 UTC 2024 - Richard Biener diff --git a/gcc.spec b/gcc.spec index 2540f21..884d321 100644 --- a/gcc.spec +++ b/gcc.spec @@ -24,8 +24,8 @@ %define gcc_suffix 13 %else %define gccsuffix %{nil} -%define gcc_version 13 -%define gcc_suffix 13 +%define gcc_version 14 +%define gcc_suffix 14 %endif Name: gcc%{gccsuffix} @@ -53,7 +53,9 @@ Name: gcc%{gccsuffix} %else %define build_d 0 %endif +%define quadmath_arch %ix86 x86_64 ia64 ppc64le %define libgccjit_sover 0 + URL: http://gcc.gnu.org/ Version: %{gcc_version} Release: 0 @@ -63,6 +65,7 @@ Group: Development/Languages/C and C++ Provides: c_compiler %if "%{gccsuffix}" != "" Provides: gcc = %{version} +Conflicts: gcc %endif Requires: cpp%{gccsuffix} Requires: gcc%{gcc_version} @@ -154,7 +157,9 @@ The system GNU Compiler documentation. + # install / update the entries + %post -n gcc%{gccsuffix}-info %install_info --info-dir=%{_infodir} --name=cpp --description='The GNU C preprocessor.' %{_infodir}/cpp.info.gz %install_info --info-dir=%{_infodir} --name=gcc --description='The GNU Compiler Collection.' %{_infodir}/gcc.info.gz @@ -177,6 +182,7 @@ Group: Development/Languages/C and C++ Provides: c++_compiler %if "%{gccsuffix}" != "" Provides: gcc-c++ = %{version} +Conflicts: gcc-c++ %endif Requires: gcc%{gcc_version}-c++ Requires: gcc%{gccsuffix} = %{version} @@ -212,6 +218,7 @@ License: GPL-3.0-only WITH GCC-exception-3.1 Group: System/Libraries %if "%{gccsuffix}" != "" Provides: libstdc++-devel = %{version} +Conflicts: libstdc++-devel %endif Requires: libstdc++6-devel-gcc%{gcc_version} @@ -242,6 +249,10 @@ The system GNU C++ 64bit development files. Summary: The system GNU Fortran Compiler License: GPL-3.0-or-later Group: Development/Languages/Fortran +%if "%{gccsuffix}" != "" +Provides: gcc-fortran = %{version} +Conflicts: gcc-fortran +%endif Requires: gcc%{gcc_version}-fortran Requires: gcc%{gccsuffix} = %{version} @@ -426,6 +437,15 @@ Requires: libgccjit%{libgccjit_sover}-devel-gcc%{gcc_version} %description -n libgccjit%{gccsuffix}-devel Package contains header files and documentation for GCC JIT front-end. +%package -n libquadmath%{gccsuffix}-devel +Summary: Development files for the quadprecision math library +License: LGPL-2.1-only +Group: Development/Languages/Fortran +Requires: libquadmath0-devel-gcc%{gcc_version} + +%description -n libquadmath%{gccsuffix}-devel +Development files for the quadprecision math library. + %prep %install @@ -695,4 +715,12 @@ fi %defattr(-,root,root) # empty - only for the dependency +%if %{gcc_version} >= 14 +%ifarch %quadmath_arch +%files -n libquadmath%{gccsuffix}-devel +%defattr(-,root,root) +# empty - only for the dependency +%endif +%endif + %changelog