SHA256
3
0
forked from pool/gcc

Accepting request 487810 from devel:gcc

- Remove README in empty packages only required for SLE11 and older.
- Remove now empty %build section.

- Fix dependencies of libstdc++-devel-{32,64}-bit.

- Switch gcc to default 7.
- Remove unrelated README.packaging.

OBS-URL: https://build.opensuse.org/request/show/487810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcc?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2017-05-27 11:05:12 +00:00 committed by Git OBS Bridge
commit 1481daee5b
3 changed files with 24 additions and 62 deletions

View File

@ -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.

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
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
- Fix dependencies of libstdc++-devel-{32,64}-bit.
-------------------------------------------------------------------
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 Fri Feb 10 10:24:49 UTC 2017 - rguenther@suse.com

View File

@ -35,9 +35,9 @@ Name: gcc
%define build_ada 0 %define build_ada 0
%endif %endif
Url: http://gcc.gnu.org/ Url: http://gcc.gnu.org/
%define gcc_version 6 %define gcc_version 7
%define gcc_suffix 6 %define gcc_suffix 7
Version: 6 Version: 7
Release: 0 Release: 0
Summary: The system GNU C Compiler Summary: The system GNU C Compiler
License: GPL-3.0+ License: GPL-3.0+
@ -52,7 +52,6 @@ Requires: gcc%{gcc_version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc%{gcc_version} BuildRequires: gcc%{gcc_version}
Source: cpp Source: cpp
Source99: README.packaging
%description %description
The system GNU C Compiler. The system GNU C Compiler.
@ -192,7 +191,8 @@ The system GNU C++ development files.
Summary: The system GNU C++ 32bit development files Summary: The system GNU C++ 32bit development files
License: GPL-3.0-with-GCC-exception License: GPL-3.0-with-GCC-exception
Group: System/Libraries Group: System/Libraries
Requires: libstdc++6-devel-gcc%{gcc_version} Requires: libstdc++-devel
Requires: libstdc++6-devel-gcc%{gcc_version}-32bit
%description -n libstdc++-devel-32bit %description -n libstdc++-devel-32bit
The system GNU C++ 32bit development files. The system GNU C++ 32bit development files.
@ -202,7 +202,8 @@ The system GNU C++ 32bit development files.
Summary: The system GNU C++ 64bit development files Summary: The system GNU C++ 64bit development files
License: GPL-3.0-with-GCC-exception License: GPL-3.0-with-GCC-exception
Group: System/Libraries Group: System/Libraries
Requires: libstdc++6-devel-gcc%{gcc_version} Requires: libstdc++-devel
Requires: libstdc++6-devel-gcc%{gcc_version}-64bit
%description -n libstdc++-devel-64bit %description -n libstdc++-devel-64bit
The system GNU C++ 64bit development files. The system GNU C++ 64bit development files.
@ -371,9 +372,6 @@ The system GNU Go Compiler 64bit support.
%prep %prep
%build
echo "This is a dummy package to provide a dependency on the system compiler." > README
%install %install
mkdir -p $RPM_BUILD_ROOT/lib mkdir -p $RPM_BUILD_ROOT/lib
mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
@ -451,7 +449,6 @@ EOF
%files -n gcc-devel %files -n gcc-devel
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-c++ %files -n gcc-c++
%defattr(-,root,root) %defattr(-,root,root)
@ -468,12 +465,10 @@ EOF
%files -n gcc-objc %files -n gcc-objc
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-obj-c++ %files -n gcc-obj-c++
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-PIE %files -n gcc-PIE
%defattr(-,root,root) %defattr(-,root,root)
@ -482,7 +477,6 @@ EOF
%files -n gcc-locale %files -n gcc-locale
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-info %files -n gcc-info
%defattr(-,root,root) %defattr(-,root,root)
@ -513,51 +507,42 @@ EOF
%files -n libstdc++-devel %files -n libstdc++-devel
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-go %files -n gcc-go
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%if %{separate_bi32} %if %{separate_bi32}
%files -n gcc-32bit %files -n gcc-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-c++-32bit %files -n gcc-c++-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n libstdc++-devel-32bit %files -n libstdc++-devel-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-fortran-32bit %files -n gcc-fortran-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-objc-32bit %files -n gcc-objc-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%if %{build_ada} %if %{build_ada}
%files -n gcc-ada-32bit %files -n gcc-ada-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%endif %endif
%files -n gcc-go-32bit %files -n gcc-go-32bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%endif %endif
%if %{separate_bi64} %if %{separate_bi64}
@ -565,39 +550,32 @@ EOF
%files -n gcc-64bit %files -n gcc-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-c++-64bit %files -n gcc-c++-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n libstdc++-devel-64bit %files -n libstdc++-devel-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-fortran-64bit %files -n gcc-fortran-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%files -n gcc-objc-64bit %files -n gcc-objc-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%if %{build_ada} %if %{build_ada}
%files -n gcc-ada-64bit %files -n gcc-ada-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%endif %endif
%files -n gcc-go-64bit %files -n gcc-go-64bit
%defattr(-,root,root) %defattr(-,root,root)
# empty - only for the dependency # empty - only for the dependency
%doc README
%endif %endif