From 08d2cc5878311bd52fe827a6b5ad2ecea86bfdd4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 7 Aug 2011 04:22:51 +0000 Subject: Sync with cvs-HEAD. --- contrib/crossrpms/gcc/base-gcc.add | 7 +++ contrib/crossrpms/gcc/base-gcj.add | 6 +- contrib/crossrpms/gcc/base-gfortran.add | 4 ++ contrib/crossrpms/gcc/base-newlib.add | 4 ++ contrib/crossrpms/gcc/gccnewlib.add | 102 +++++++++++++++++++++++++++----- contrib/crossrpms/gcc/install.add | 2 + 6 files changed, 107 insertions(+), 18 deletions(-) diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add index 219a127b1d..4119209783 100644 --- a/contrib/crossrpms/gcc/base-gcc.add +++ b/contrib/crossrpms/gcc/base-gcc.add @@ -6,6 +6,7 @@ Summary: Base package for rtems gcc and newlib C Library Group: Development/Tools Version: %{gcc_rpmvers} +%{?_with_noarch_subpackages:BuildArch: noarch} License: GPL Requires(post): /sbin/install-info @@ -16,6 +17,9 @@ GCC files that are shared by all targets. %files -n @rpmprefix@gcc-common %defattr(-,root,root) +%sysdir %{_prefix} +%sysdir %{_prefix}/share + %sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/cpp.info* @@ -23,6 +27,9 @@ GCC files that are shared by all targets. %{_infodir}/gcc.info* %{_infodir}/gccint.info* %{_infodir}/gccinstall.info* +%if "%{gcc_version}" >= "4.6.0" +%{_infodir}/libquadmath.info* +%endif %sysdir %{_mandir} %sysdir %{_mandir}/man7 diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add index d9ba5df0a4..fe8aed9940 100644 --- a/contrib/crossrpms/gcc/base-gcj.add +++ b/contrib/crossrpms/gcc/base-gcj.add @@ -19,6 +19,8 @@ This is the files for gcc/java (gcj) that are shared by all targets. %files -n @rpmprefix@gcc-gcj-common %defattr(-,root,root) +%sysdir %{_prefix} +%sysdir %{_prefix}/share %sysdir %{_infodir} %ghost %{_infodir}/dir @@ -45,8 +47,8 @@ This is the files for gcc/java (gcj) that are shared by all targets. %preun -n @rpmprefix@gcc-gcj-common if [ $1 -eq 0 ]; then -/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || : -/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || : + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || : fi %endif diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add index 3cf3359a15..993f763b38 100644 --- a/contrib/crossrpms/gcc/base-gfortran.add +++ b/contrib/crossrpms/gcc/base-gfortran.add @@ -6,6 +6,7 @@ %package -n @rpmprefix@gcc-gfortran-common Summary: Base package for RTEMS gcc/gfortran compiler Group: Development/Tools +%{?_with_noarch_subpackages:BuildArch: noarch} License: GPL Requires(post): /sbin/install-info @@ -18,6 +19,9 @@ This is the files for gcc/gfortran that are shared by all targets. %files -n @rpmprefix@gcc-gfortran-common %defattr(-,root,root) +%sysdir %{_prefix} +%sysdir %{_prefix}/share + %sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gfortran.info*.gz diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add index 73ee9e1fd7..8dbe5aab85 100644 --- a/contrib/crossrpms/gcc/base-newlib.add +++ b/contrib/crossrpms/gcc/base-newlib.add @@ -8,6 +8,7 @@ Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} Release: @NEWLIB_RPMREL@ +%{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable Requires(post): /sbin/install-info @@ -18,6 +19,9 @@ newlib files that are shared by all targets. %files -n @rpmprefix@newlib-common %defattr(-,root,root) +%sysdir %{_prefix} +%sysdir %{_prefix}/share + %sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/libc.info* diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 177e80516a..008645d09b 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -91,11 +91,61 @@ BuildRequires: %{_host_rpmprefix}gcc %endif %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define gmp_required 4.1 +%define mpfr_required 2.3.1 +%endif + +%if "%{gcc_version}" >= "4.3.3" +%define cloog_required 0.15 +%endif + +%if "%{gcc_version}" >= "4.4.0" +%define mpfr_required 2.3.2 +%endif + +%if "%{gcc_version}" >= "4.5.0" +%define mpc_required 0.8 +%if %{with lto} +%define libelf_required 0.8.12 +%endif +%endif + +%if %{defined mpc_required} +%if "%{mpc_provided}" >= "%{mpc_required}" +%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} +%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} +%endif +%else +%define _build_mpc 1 +%define gmp_required 4.2 +%endif +%endif + +%if %{defined gmp_required} +%if "%{gmp_provided}" >= "%{gmp_required}" +BuildRequires: gmp-devel >= %{gmp_required} +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} +%endif +%else +%define _build_gmp 1 +%endif +%endif + +%if %{defined libelf_required} +%if "%{libelf_provided}" >= "%{libelf_required}" +BuildRequires: libelf-devel >= %{libelf_required} +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} +%endif +%else +%define _build_libelf 1 %endif +%endif + + %if %{defined cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -103,12 +153,18 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} + + +%if %{defined mpfr_required} +%if "%{mpfr_provided}" >= "%{mpfr_required}" +BuildRequires: mpfr-devel >= %{mpfr_required} +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} +%endif +%else +%define _build_mpfr 1 +%endif %endif %if "%{_build}" != "%{_host}" @@ -117,12 +173,6 @@ BuildRequires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers} %if "%{gcc_version}" >= "4.2.0" BuildRequires: flex bison -%if %build_fortran -BuildRequires: gmp-devel >= 4.1 -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.2.1 -%endif -%endif %endif %if %build_gcj @@ -141,13 +191,21 @@ Requires: @rpmprefix@gcc-common Requires: @rpmprefix@@tool_target@-binutils Requires: @rpmprefix@@tool_target@-sys-root Requires: @rpmprefix@@tool_target@-w32api-sys-root +Requires: @rpmprefix@@tool_target@-gcc-libgcc = %{gcc_rpmvers}-%{release} %if %build_newlib Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@ %endif +%if "%{gcc_version}" >= "4.5.0" +BuildRequires: zlib-devel +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}zlib-devel +%endif +%else %if %build_gcj BuildRequires: zlib-devel %endif +%endif %if %build_gnat # Building gnat requires gnat BuildRequires: gcc-gnat @@ -158,8 +216,20 @@ BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMRE @SOURCES@ -%if "%{gcc_version}" >= "4.3.0" -Source60: http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2 +%if 0%{?_build_mpfr} +Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 +%endif + +%if 0%{?_build_mpc} +Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz +%endif + +%if 0%{?_build_gmp} +Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 +%endif + +%if 0%{?_build_libelf} +Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz %endif %description diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 3eb3f5733f..8591617ede 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -118,6 +118,8 @@ *include/objc*) ;; *include/g++*);; *include/c++*);; + *include-fixed/*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; -- cgit v1.2.3