From 0199c2a4e9ac587a1c1c000ace1c601ac8aeb142ab9cc7c298b809282ad3299f Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 18 Mar 2024 13:48:16 +0000 Subject: [PATCH 1/4] - Add gcc-c++ and libstdc++-devel Provides to the -build flavor of those packages. Should fix build of boost in ALP. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=126 --- gcc.changes | 6 ++++++ gcc.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc.changes b/gcc.changes index 87fa8b5..6574c5c 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 18 13:47:32 UTC 2024 - Richard Biener + +- Add gcc-c++ and libstdc++-devel Provides to the -build flavor + of those packages. Should fix build of boost in ALP. + ------------------------------------------------------------------- Wed Feb 14 09:27:54 UTC 2024 - Richard Biener diff --git a/gcc.spec b/gcc.spec index 4738831..0f79d34 100644 --- a/gcc.spec +++ b/gcc.spec @@ -150,12 +150,6 @@ The system GNU Compiler documentation. - - - - - - # install / update the entries %post -n gcc%{gccsuffix}-info @@ -178,6 +172,9 @@ Summary: The system GNU C++ Compiler License: GPL-3.0-or-later Group: Development/Languages/C and C++ Provides: c++_compiler +%if "%{gccsuffix}" != "" +Provides: gcc-c++ = %{version} +%endif Requires: gcc%{gcc_version}-c++ Requires: gcc%{gccsuffix} = %{version} @@ -210,6 +207,9 @@ The system GNU C++ Compiler 64 bit support. Summary: The system GNU C++ development files License: GPL-3.0-only WITH GCC-exception-3.1 Group: System/Libraries +%if "%{gccsuffix}" != "" +Provides: libstdc++-devel = %{version} +%endif Requires: libstdc++6-devel-gcc%{gcc_version} %description -n libstdc++%{gccsuffix}-devel From b49cf631e725c09c7ad18abc671f7a0ddeca47cc97495778674f30b0df487c7a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 19 Mar 2024 07:30:11 +0000 Subject: [PATCH 2/4] - Add gcc, gcc-c++ and libstdc++-devel Provides to the -build flavor OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=127 --- gcc.changes | 2 +- gcc.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc.changes b/gcc.changes index 6574c5c..345340e 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Mar 18 13:47:32 UTC 2024 - Richard Biener -- Add gcc-c++ and libstdc++-devel Provides to the -build flavor +- Add gcc, gcc-c++ and libstdc++-devel Provides to the -build flavor of those packages. Should fix build of boost in ALP. ------------------------------------------------------------------- diff --git a/gcc.spec b/gcc.spec index 0f79d34..2540f21 100644 --- a/gcc.spec +++ b/gcc.spec @@ -61,6 +61,9 @@ Summary: The system GNU C Compiler License: GPL-3.0-or-later Group: Development/Languages/C and C++ Provides: c_compiler +%if "%{gccsuffix}" != "" +Provides: gcc = %{version} +%endif Requires: cpp%{gccsuffix} Requires: gcc%{gcc_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -150,8 +153,8 @@ The system GNU Compiler documentation. -# install / update the entries +# 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 From 97fc35c75f3f461466777dde9e3abbe4617a053b15a6a958cb575ef9b89672fa Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 20 Mar 2024 09:49:23 +0000 Subject: [PATCH 3/4] - Add conflicts where -build variants provide the non-build variant. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=128 --- gcc.changes | 5 +++++ gcc.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gcc.changes b/gcc.changes index 345340e..5587391 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..d9bebc1 100644 --- a/gcc.spec +++ b/gcc.spec @@ -63,6 +63,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} @@ -155,6 +156,7 @@ 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 +179,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 +215,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} From 863f6864527435dea55c8cd75588480f74aa02ee5c5a4fbbd015d3b17b167de1 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 5 Aug 2024 11:19:08 +0000 Subject: [PATCH 4/4] - Add libquadmath-devel package for GCC 14. - Bump GCC version to 14, leave -build flavor at 13. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=129 --- gcc.changes | 6 ++++++ gcc.spec | 25 ++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/gcc.changes b/gcc.changes index 5587391..a02a2a9 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/gcc.spec b/gcc.spec index d9bebc1..5659ae1 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 @@ -155,8 +157,8 @@ The system GNU Compiler documentation. -# install / update the entries +# 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 @@ -430,6 +432,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 @@ -699,4 +710,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