From 13fbef92451c5f59505a3accf10117a72db1c313d7956631d12c3de11993d80e Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 23 Mar 2017 12:57:59 +0000 Subject: [PATCH 1/4] - Switch gcc to default 7. - Remove unrelated README.packaging. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=73 --- README.packaging | 33 --------------------------------- gcc.changes | 6 ++++++ gcc.spec | 7 +++---- 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 README.packaging diff --git a/README.packaging b/README.packaging deleted file mode 100644 index c8b15a2..0000000 --- a/README.packaging +++ /dev/null @@ -1,33 +0,0 @@ -Packaging GCC -============= - -Shared libraries used by programs that are linked _with_ gcc need -to go into separate packages. Shared library package names should -contain the libraries major .so version to allow parallel installation -of both programs using and gccs linking against those libraries. -An example is the libgfortran and libgfortran2 packages. - -The development part of language runtime libraries go into -libFOOver-devel packages and depend on the proper libFOOsover package. - - -Build variants supported -======================== - -The gcc packages can build different flavors of compiler packages. - - - The standard compiler packages are installed beyond /usr. - - - Sets of packages for installation beyond /opt/gcc are provided - if enabled by %{gcc_for_opt} (related: @PREFIX_FOR_OPT@, @LIBDIR_FOR_OPT@, - @GCC_FOR_OPT@ - - - cross.spec.in is used for auto-generation of - cross-*-gcc-icecream-backend.spec by the change_spec script using - parts of the configuration from the main compiler. These packages - provide tarballs with just cc1 and cc1plus serving as icecream environments. - - - micro-cross.spec.in is a script that is called from change_spec and - outputs cross-*-gcc.spec files. These packages provide cross compiler - environments beyond /opt/cross for C and C++ as a single package. - diff --git a/gcc.changes b/gcc.changes index 604b345..40dcb37 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 23 12:56:31 UTC 2017 - rguenther@suse.com + +- Switch gcc to default 7. +- Remove unrelated README.packaging. + ------------------------------------------------------------------- Fri Feb 10 10:24:49 UTC 2017 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 83b2560..a851497 100644 --- a/gcc.spec +++ b/gcc.spec @@ -35,9 +35,9 @@ Name: gcc %define build_ada 0 %endif Url: http://gcc.gnu.org/ -%define gcc_version 6 -%define gcc_suffix 6 -Version: 6 +%define gcc_version 7 +%define gcc_suffix 7 +Version: 7 Release: 0 Summary: The system GNU C Compiler License: GPL-3.0+ @@ -52,7 +52,6 @@ Requires: gcc%{gcc_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc%{gcc_version} Source: cpp -Source99: README.packaging %description The system GNU C Compiler. From 0926b94f53bb1930e5310bd376538af531ec10e8c5e6f7b629a2e2d7b381e36c Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 4 Apr 2017 07:15:07 +0000 Subject: [PATCH 2/4] Accepting request 484895 from home:Andreas_Schwab:Factory - Fix dependencies of libstdc++-devel-{32,64}-bit OBS-URL: https://build.opensuse.org/request/show/484895 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=74 --- gcc.changes | 5 +++++ gcc.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc.changes b/gcc.changes index 40dcb37..78aa71a 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 3 15:29:19 UTC 2017 - schwab@suse.de + +- Fix dependencies of libstdc++-devel-{32,64}-bit + ------------------------------------------------------------------- Thu Mar 23 12:56:31 UTC 2017 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index a851497..5355fa2 100644 --- a/gcc.spec +++ b/gcc.spec @@ -191,7 +191,7 @@ The system GNU C++ development files. Summary: The system GNU C++ 32bit development files License: GPL-3.0-with-GCC-exception Group: System/Libraries -Requires: libstdc++6-devel-gcc%{gcc_version} +Requires: libstdc++6-devel-gcc%{gcc_version}-32bit %description -n libstdc++-devel-32bit The system GNU C++ 32bit development files. @@ -201,7 +201,7 @@ The system GNU C++ 32bit development files. Summary: The system GNU C++ 64bit development files License: GPL-3.0-with-GCC-exception Group: System/Libraries -Requires: libstdc++6-devel-gcc%{gcc_version} +Requires: libstdc++6-devel-gcc%{gcc_version}-64bit %description -n libstdc++-devel-64bit The system GNU C++ 64bit development files. From ade6869ee8eda2cd97a754c48c18975f3bc9103a7a7e5394c36dca70db7a5211 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 4 Apr 2017 07:16:54 +0000 Subject: [PATCH 3/4] - Fix dependencies of libstdc++-devel-{32,64}-bit. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=75 --- gcc.changes | 4 ++-- gcc.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc.changes b/gcc.changes index 78aa71a..19939c9 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Mon Apr 3 15:29:19 UTC 2017 - schwab@suse.de +Tue Apr 4 07:16:09 UTC 2017 - rguenther@suse.com -- Fix dependencies of libstdc++-devel-{32,64}-bit +- Fix dependencies of libstdc++-devel-{32,64}-bit. ------------------------------------------------------------------- Thu Mar 23 12:56:31 UTC 2017 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 5355fa2..38c4674 100644 --- a/gcc.spec +++ b/gcc.spec @@ -191,6 +191,7 @@ The system GNU C++ development files. Summary: The system GNU C++ 32bit development files License: GPL-3.0-with-GCC-exception Group: System/Libraries +Requires: libstdc++-devel Requires: libstdc++6-devel-gcc%{gcc_version}-32bit %description -n libstdc++-devel-32bit @@ -201,6 +202,7 @@ The system GNU C++ 32bit development files. Summary: The system GNU C++ 64bit development files License: GPL-3.0-with-GCC-exception Group: System/Libraries +Requires: libstdc++-devel Requires: libstdc++6-devel-gcc%{gcc_version}-64bit %description -n libstdc++-devel-64bit From d047914e79e46c47ba9f6eceb905867b35e2c62f8f3ef155599d29b0589a4f95 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 13 Apr 2017 08:56:51 +0000 Subject: [PATCH 4/4] - Remove README in empty packages only required for SLE11 and older. - Remove now empty %build section. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=76 --- gcc.changes | 6 ++++++ gcc.spec | 23 ----------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/gcc.changes b/gcc.changes index 19939c9..9f19b1e 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 13 08:52:35 UTC 2017 - rguenther@suse.com + +- Remove README in empty packages only required for SLE11 and older. +- Remove now empty %build section. + ------------------------------------------------------------------- Tue Apr 4 07:16:09 UTC 2017 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 38c4674..44bc985 100644 --- a/gcc.spec +++ b/gcc.spec @@ -372,9 +372,6 @@ The system GNU Go Compiler 64bit support. %prep -%build -echo "This is a dummy package to provide a dependency on the system compiler." > README - %install mkdir -p $RPM_BUILD_ROOT/lib mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin @@ -452,7 +449,6 @@ EOF %files -n gcc-devel %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-c++ %defattr(-,root,root) @@ -469,12 +465,10 @@ EOF %files -n gcc-objc %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-obj-c++ %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-PIE %defattr(-,root,root) @@ -483,7 +477,6 @@ EOF %files -n gcc-locale %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-info %defattr(-,root,root) @@ -514,51 +507,42 @@ EOF %files -n libstdc++-devel %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-go %defattr(-,root,root) # empty - only for the dependency -%doc README %if %{separate_bi32} %files -n gcc-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-c++-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n libstdc++-devel-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-fortran-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-objc-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %if %{build_ada} %files -n gcc-ada-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %endif %files -n gcc-go-32bit %defattr(-,root,root) # empty - only for the dependency -%doc README %endif %if %{separate_bi64} @@ -566,39 +550,32 @@ EOF %files -n gcc-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-c++-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n libstdc++-devel-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-fortran-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %files -n gcc-objc-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %if %{build_ada} %files -n gcc-ada-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %endif %files -n gcc-go-64bit %defattr(-,root,root) # empty - only for the dependency -%doc README %endif