Accepting request 308204 from devel:gcc
- Properly query gcc-%gcc_suffix for paths. - Fix bogus requires to gcc5-c++-{32,64}bit. - Adjust for GCC 5 package renames. - Switch gcc to default 5. - Add gcc-go{,-32bit,-64bit} packages. OBS-URL: https://build.opensuse.org/request/show/308204 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcc?expand=0&rev=53
This commit is contained in:
commit
37a1d32cb8
21
gcc.changes
21
gcc.changes
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 21 09:25:10 UTC 2015 - rguenther@suse.com
|
||||||
|
|
||||||
|
- Properly query gcc-%gcc_suffix for paths.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 19 12:11:27 UTC 2015 - rguenther@suse.com
|
||||||
|
|
||||||
|
- Fix bogus requires to gcc5-c++-{32,64}bit.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 8 13:00:15 UTC 2015 - rguenther@suse.com
|
||||||
|
|
||||||
|
- Adjust for GCC 5 package renames.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 20 10:24:01 UTC 2015 - rguenther@suse.com
|
||||||
|
|
||||||
|
- Switch gcc to default 5.
|
||||||
|
- Add gcc-go{,-32bit,-64bit} packages.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 2 13:34:23 UTC 2015 - schwab@suse.de
|
Mon Mar 2 13:34:23 UTC 2015 - schwab@suse.de
|
||||||
|
|
||||||
|
67
gcc.spec
67
gcc.spec
@ -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 48
|
%define gcc_version 5
|
||||||
%define gcc_suffix 4.8
|
%define gcc_suffix 5
|
||||||
Version: 4.8
|
Version: 5
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: The system GNU C Compiler
|
Summary: The system GNU C Compiler
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
@ -149,9 +149,9 @@ The system GNU C++ Compiler.
|
|||||||
Summary: The system GNU C++ Compiler
|
Summary: The system GNU C++ Compiler
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
Group: Development/Languages/C and C++
|
Group: Development/Languages/C and C++
|
||||||
|
Requires: gcc%{gcc_version}-c++-32bit
|
||||||
Requires: gcc-32bit = %{version}
|
Requires: gcc-32bit = %{version}
|
||||||
Requires: gcc-c++ = %{version}
|
Requires: gcc-c++ = %{version}
|
||||||
Requires: libstdc++%{gcc_version}-devel-32bit
|
|
||||||
|
|
||||||
%description -n gcc-c++-32bit
|
%description -n gcc-c++-32bit
|
||||||
The system GNU C++ Compiler 32 bit support.
|
The system GNU C++ Compiler 32 bit support.
|
||||||
@ -161,9 +161,9 @@ The system GNU C++ Compiler 32 bit support.
|
|||||||
Summary: The system GNU C++ Compiler
|
Summary: The system GNU C++ Compiler
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
Group: Development/Languages/C and C++
|
Group: Development/Languages/C and C++
|
||||||
|
Requires: gcc%{gcc_version}-c++-64bit
|
||||||
Requires: gcc-64bit = %{version}
|
Requires: gcc-64bit = %{version}
|
||||||
Requires: gcc-c++ = %{version}
|
Requires: gcc-c++ = %{version}
|
||||||
Requires: libstdc++%{gcc_version}-devel-64bit
|
|
||||||
|
|
||||||
%description -n gcc-c++-64bit
|
%description -n gcc-c++-64bit
|
||||||
The system GNU C++ Compiler 64 bit support.
|
The system GNU C++ Compiler 64 bit support.
|
||||||
@ -174,7 +174,7 @@ The system GNU C++ Compiler 64 bit support.
|
|||||||
Summary: The system GNU C++ development files
|
Summary: The system GNU C++ development files
|
||||||
License: GPL-3.0-with-GCC-exception
|
License: GPL-3.0-with-GCC-exception
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Requires: libstdc++%{gcc_version}-devel
|
Requires: libstdc++6-devel-gcc%{gcc_version}
|
||||||
|
|
||||||
%description -n libstdc++-devel
|
%description -n libstdc++-devel
|
||||||
The system GNU C++ development files.
|
The system GNU C++ development files.
|
||||||
@ -184,7 +184,7 @@ 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++%{gcc_version}-devel-32bit
|
Requires: libstdc++6-devel-gcc%{gcc_version}
|
||||||
|
|
||||||
%description -n libstdc++-devel-32bit
|
%description -n libstdc++-devel-32bit
|
||||||
The system GNU C++ 32bit development files.
|
The system GNU C++ 32bit development files.
|
||||||
@ -194,7 +194,7 @@ 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++%{gcc_version}-devel-64bit
|
Requires: libstdc++6-devel-gcc%{gcc_version}
|
||||||
|
|
||||||
%description -n libstdc++-devel-64bit
|
%description -n libstdc++-devel-64bit
|
||||||
The system GNU C++ 64bit development files.
|
The system GNU C++ 64bit development files.
|
||||||
@ -252,7 +252,7 @@ The system GNU Java Compiler.
|
|||||||
Summary: The system GNU Java development files.
|
Summary: The system GNU Java development files.
|
||||||
License: GPL-2.0-with-classpath-exception
|
License: GPL-2.0-with-classpath-exception
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Requires: libgcj%{gcc_version}-devel
|
Requires: libgcj-devel-gcc%{gcc_version}
|
||||||
|
|
||||||
%description -n libgcj-devel
|
%description -n libgcj-devel
|
||||||
The system GNU Java development files.
|
The system GNU Java development files.
|
||||||
@ -386,6 +386,38 @@ Requires: gcc-ada = %{version}
|
|||||||
%description -n gcc-ada-64bit
|
%description -n gcc-ada-64bit
|
||||||
The system GNU Ada Compiler 64 bit support.
|
The system GNU Ada Compiler 64 bit support.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n gcc-go
|
||||||
|
Summary: The system GNU Go Compiler
|
||||||
|
License: GPL-3.0+
|
||||||
|
Group: Development/Languages/C and C++
|
||||||
|
Requires: gcc = %{version}
|
||||||
|
Requires: gcc%{gcc_version}-go
|
||||||
|
|
||||||
|
%description -n gcc-go
|
||||||
|
The system GNU Go Compiler.
|
||||||
|
|
||||||
|
%package -n gcc-go-32bit
|
||||||
|
Summary: The system GNU Go Compiler
|
||||||
|
License: GPL-3.0+
|
||||||
|
Group: Development/Languages/C and C++
|
||||||
|
Requires: gcc%{gcc_version}-go-32bit
|
||||||
|
Requires: gcc-go = %{version}
|
||||||
|
|
||||||
|
%description -n gcc-go-32bit
|
||||||
|
The system GNU Go Compiler 32bit support.
|
||||||
|
|
||||||
|
%package -n gcc-go-64bit
|
||||||
|
Summary: The system GNU Go Compiler
|
||||||
|
License: GPL-3.0+
|
||||||
|
Group: Development/Languages/C and C++
|
||||||
|
Requires: gcc%{gcc_version}-go-64bit
|
||||||
|
Requires: gcc-go = %{version}
|
||||||
|
|
||||||
|
%description -n gcc-go-64bit
|
||||||
|
The system GNU Go Compiler 64bit support.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -455,7 +487,7 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/bfd-plugins
|
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/bfd-plugins
|
||||||
ln -s `gcc-%{gcc_suffix} -print-file-name=liblto_plugin.so.0.0.0` $RPM_BUILD_ROOT%{_prefix}/lib/bfd-plugins/liblto_plugin.so.0.0.0
|
ln -s `gcc-%{gcc_suffix} -print-file-name=liblto_plugin.so.0.0.0` $RPM_BUILD_ROOT%{_prefix}/lib/bfd-plugins/liblto_plugin.so.0.0.0
|
||||||
|
|
||||||
dir=`gcc -print-prog-name=cc1`
|
dir=`gcc-%{gcc_suffix} -print-prog-name=cc1`
|
||||||
dir=${dir%/cc1}
|
dir=${dir%/cc1}
|
||||||
mkdir -p $RPM_BUILD_ROOT/$dir
|
mkdir -p $RPM_BUILD_ROOT/$dir
|
||||||
cat > $RPM_BUILD_ROOT/$dir/defaults.spec <<EOF
|
cat > $RPM_BUILD_ROOT/$dir/defaults.spec <<EOF
|
||||||
@ -595,6 +627,11 @@ EOF
|
|||||||
# empty - only for the dependency
|
# empty - only for the dependency
|
||||||
%doc README
|
%doc README
|
||||||
|
|
||||||
|
%files -n gcc-go
|
||||||
|
%defattr(-,root,root)
|
||||||
|
# empty - only for the dependency
|
||||||
|
%doc README
|
||||||
|
|
||||||
%if %{separate_bi32}
|
%if %{separate_bi32}
|
||||||
|
|
||||||
%files -n gcc-32bit
|
%files -n gcc-32bit
|
||||||
@ -634,6 +671,11 @@ EOF
|
|||||||
%doc README
|
%doc README
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files -n gcc-go-32bit
|
||||||
|
%defattr(-,root,root)
|
||||||
|
# empty - only for the dependency
|
||||||
|
%doc README
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
%if %{separate_bi64}
|
%if %{separate_bi64}
|
||||||
|
|
||||||
@ -674,6 +716,11 @@ EOF
|
|||||||
%doc README
|
%doc README
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%files -n gcc-go-64bit
|
||||||
|
%defattr(-,root,root)
|
||||||
|
# empty - only for the dependency
|
||||||
|
%doc README
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user