Sync with cvs-HEAD.

This commit is contained in:
Ralf Corsepius
2011-08-07 03:57:46 +00:00
parent 2b29f934ce
commit b66f71f339
9 changed files with 155 additions and 19 deletions

View File

@@ -19,9 +19,6 @@
%if %build_gnat
languages="$languages,ada"
%endif
%if %build_libgcj
optargs="--enable-libgcj"
%endif
%if "%{_prefix}" != "/usr"
export PATH="%{_bindir}:${PATH}"
%endif

View File

@@ -8,8 +8,6 @@
%define newlib_version @NEWLIB_VERS@
%endif
%define mpfr_version 2.3.1
Name: @rpmprefix@@tool_target@-gcc
Summary: @tool_target@ gcc

View File

@@ -52,6 +52,27 @@ cd ..
ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
%endif
%if 0%{?_build_mpc}
%setup -q -T -D -n %{name}-%{version} -a61
%{?PATCH61:%patch61 -p1}
# Build mpc one-tree style
ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
%endif
%if 0%{?_build_gmp}
%setup -q -T -D -n %{name}-%{version} -a62
%{?PATCH62:%patch62 -p1}
# Build gmp one-tree style
ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
%endif
%if 0%{?_build_libelf}
%setup -q -T -D -n %{name}-%{version} -a63
%{?PATCH63:%patch63 -p1}
# Build libelf one-tree style
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
@PREP@
# Fix timestamps

View File

@@ -7,6 +7,7 @@ Summary: GCC c++ compiler for @tool_target@
Group: Development/Tools
Version: %{gcc_rpmvers}
License: GPL
Requires: @rpmprefix@@tool_target@-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
%if "%{_build}" != "%{_host}"
BuildRequires: @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
@@ -20,18 +21,44 @@ Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
%description -n @rpmprefix@@tool_target@-gcc-c++
GCC c++ compiler for @tool_target@.
%files -n @rpmprefix@@tool_target@-gcc-c++ -f build/files.g++
%package -n @rpmprefix@@tool_target@-gcc-libstdc++
Summary: libstdc++ for @tool_target@
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: GPL
%description -n @rpmprefix@@tool_target@-gcc-libstdc++
%{summary}
%files -n @rpmprefix@@tool_target@-gcc-c++
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target@-g++.1*
%sysdir %{_bindir}
%{_bindir}/@tool_target@-c++%{_exeext}
%{_bindir}/@tool_target@-g++%{_exeext}
%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
%files -n @rpmprefix@@tool_target@-gcc-libstdc++ -f build/files.g++
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_gcclibdir}
%dir %{_gcclibdir}/gcc
%dir %{_gcclibdir}/gcc/@tool_target@
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
%endif

View File

@@ -16,8 +16,25 @@
%description -n @rpmprefix@@tool_target@-gcc
GNU cc compiler for @tool_target@.
%files -n @rpmprefix@@tool_target@-gcc -f build/files.gcc
# ==============================================================
# @rpmprefix@@tool_target@-gcc-libgcc
# ==============================================================
%package -n @rpmprefix@@tool_target@-gcc-libgcc
Summary: libgcc for @tool_target@-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
License: GPL
%description -n @rpmprefix@@tool_target@-gcc-libgcc
libgcc @tool_target@-gcc.
%files -n @rpmprefix@@tool_target@-gcc
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target@-gcc.1*
@@ -29,9 +46,30 @@ GNU cc compiler for @tool_target@.
%{_bindir}/@tool_target@-gcc%{_exeext}
%{_bindir}/@tool_target@-gcc-%{gcc_version}%{_exeext}
%{_bindir}/@tool_target@-gcov%{_exeext}
%if "%{gcc_version}" < "4.6.0"
%{_bindir}/@tool_target@-gccbug
%endif
%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext}
%if "%{gcc_version}" >= "4.5.0"
%{?with_lto:%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto%{_exeext}}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto-wrapper%{_exeext}
%endif
%files -n @rpmprefix@@tool_target@-gcc-libgcc -f build/files.gcc
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_gcclibdir}
%dir %{_gcclibdir}/gcc
%dir %{_gcclibdir}/gcc/@tool_target@
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
%if "%{gcc_version}" > "4.0.3"
%if "@tool_target@" != "bfin-rtems@rtems_api@"
%if "@tool_target@" != "avr-rtems@rtems_api@"
@@ -41,12 +79,6 @@ GNU cc compiler for @tool_target@.
%endif
%if "%{gcc_version}" >= "4.3.0"
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
%endif
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext}

View File

@@ -11,20 +11,50 @@ License: GPL
%if %build_infos
Requires: @rpmprefix@gcc-gfortran-common
%endif
Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
Requires: @rpmprefix@@tool_target@-gcc-libgfortran = %{gcc_rpmvers}-%{release}
%description -n @rpmprefix@@tool_target@-gcc-gfortran
GCC fortran compiler for @tool_target@.
%files -n @rpmprefix@@tool_target@-gcc-gfortran -f build/files.gfortran
%files -n @rpmprefix@@tool_target@-gcc-gfortran
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_bindir}
%{_bindir}/@tool_target@-gfortran%{_exeext}
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target@-gfortran.1*
%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext}
# ==============================================================
# @rpmprefix@@tool_target@-gcc-libgfortran
# ==============================================================
%package -n @rpmprefix@@tool_target@-gcc-libgfortran
Summary: Fortran 95 support libraries for @tool_target@-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: GPL
%description -n @rpmprefix@@tool_target@-gcc-libgfortran
%{summary}
%files -n @rpmprefix@@tool_target@-gcc-libgfortran -f build/files.gfortran
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_gcclibdir}
%dir %{_gcclibdir}/gcc
%dir %{_gcclibdir}/gcc/@tool_target@
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%if "%{gcc_version}" >= "4.2.0"
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/finclude
%endif
%endif

View File

@@ -7,7 +7,6 @@ Summary: Ada support for for @tool_target@-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
License: GPL
Provides: @rpmprefix@@tool_target@-gcc-gnat = %{gcc_rpmvers}-%{release}
%if %_build_infos
Requires: @rpmprefix@gcc-gnat-common
@@ -21,14 +20,22 @@ This is the gcc/gnat compiler for @tool_target@.
%files -n @rpmprefix@@tool_target@-gcc-gnat
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_bindir}
%{_bindir}/@tool_target@-gnat*
%{_bindir}/@tool_target@-gprmake%{_exeext}
%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext}
%sysdir %{_gcclibdir}
%dir %{_gcclibdir}/gcc
%dir %{_gcclibdir}/gcc/@tool_target@
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
%endif

View File

@@ -8,6 +8,7 @@ Group: Development/Tools
License: Distributable
Version: %{newlib_version}
Release: @NEWLIB_RPMREL@
%{?_with_noarch_subpackages:BuildArch: noarch}
%if %build_infos
Requires: @rpmprefix@newlib-common
@@ -18,7 +19,7 @@ Newlib C Library for @tool_target@.
%files -n @rpmprefix@@tool_target@-newlib -f build/files.newlib
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_exec_prefix}
%dir %{_exec_prefix}/@tool_target@
%{_exec_prefix}/@tool_target@/include

View File

@@ -9,18 +9,41 @@ Version: %{gcc_rpmvers}
License: GPL
Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
Requires: @rpmprefix@@tool_target@-gcc-libobjc = %{gcc_rpmvers}-%{release}
%description -n @rpmprefix@@tool_target@-gcc-objc
GCC objc compiler for @tool_target@.
%files -n @rpmprefix@@tool_target@-gcc-objc -f build/files.objc
%files -n @rpmprefix@@tool_target@-gcc-objc
%defattr(-,root,root)
%sysdir %{_exec_prefix}
%sysdir %{_libexecdir}
%dir %{_libexecdir}/gcc
%dir %{_libexecdir}/gcc/@tool_target@
%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version}
%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
# ==============================================================
# @rpmprefix@@tool_target@-gcc-libobjc
# ==============================================================
%package -n @rpmprefix@@tool_target@-gcc-libobjc
Summary: Objective C support for @tool_target@-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: GPL
%description -n @rpmprefix@@tool_target@-gcc-libobjc
Support libraries for GCC's objc compiler for @tool_target@.
%files -n @rpmprefix@@tool_target@-gcc-libobjc -f build/files.objc
%defattr(-,root,root)
%sysdir %{_prefix}
%sysdir %{_gcclibdir}
%dir %{_gcclibdir}/gcc
%dir %{_gcclibdir}/gcc/@tool_target@
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
%endif