diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-04-20 09:28:37 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-04-20 09:28:37 +0000 |
commit | 5faedff72ba83b09ee754dc76e08a859bdaa4681 (patch) | |
tree | 7176064ae8557538aa87646da1dda9088ce61484 /contrib | |
parent | Bump GCC_RPMREL. (diff) | |
download | rtems-5faedff72ba83b09ee754dc76e08a859bdaa4681.tar.bz2 |
Regenerate.
Diffstat (limited to 'contrib')
13 files changed, 567 insertions, 207 deletions
diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec index be789b0203..5e62aeab2e 100644 --- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-arm-rtems4.10-gcc Summary: arm-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-arm-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-arm-rtems4.10-binutils -Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-arm-rtems4.10-binutils -# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for arm-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for arm-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec index 6488759fe0..c7e213e505 100644 --- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: avr-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,7 +130,7 @@ BuildRequires: rtems-4.10-avr-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-avr-rtems4.10-binutils -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -460,7 +460,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-avr-rtems4.10-binutils -# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -577,7 +577,7 @@ Summary: C Library (newlib) for avr-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -597,7 +597,7 @@ Newlib C Library for avr-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec index adfe3b6802..ff9c3eade1 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-bfin-rtems4.10-gcc Summary: bfin-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-bfin-rtems4.10-binutils -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-bfin-rtems4.10-binutils -# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for bfin-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for bfin-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec index 2a7c0d9bef..18264ccdec 100644 --- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-h8300-rtems4.10-gcc Summary: h8300-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-h8300-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-h8300-rtems4.10-binutils -Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-h8300-rtems4.10-binutils -# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for h8300-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for h8300-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec index f5663b80d8..0e67ee5719 100644 --- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-i386-rtems4.10-gcc Summary: i386-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-i386-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-i386-rtems4.10-binutils -Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-i386-rtems4.10-binutils -# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for i386-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for i386-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec index f3afb03564..a33b140a1c 100644 --- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-lm32-rtems4.10-gcc Summary: lm32-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-lm32-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-lm32-rtems4.10-binutils -Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-lm32-rtems4.10-binutils -# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for lm32-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for lm32-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec index cc090cd41e..0ae432bf16 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-m32c-rtems4.10-gcc Summary: m32c-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -99,7 +129,7 @@ BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-m32c-rtems4.10-binutils -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -430,7 +460,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32c-rtems4.10-binutils -# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -489,7 +519,7 @@ Summary: C Library (newlib) for m32c-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} %description -n rtems-4.10-m32c-rtems4.10-newlib diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec index 06a00bd7d6..0acd97893f 100644 --- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-m32r-rtems4.10-gcc Summary: m32r-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -99,7 +129,7 @@ BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-m32r-rtems4.10-binutils -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -430,7 +460,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32r-rtems4.10-binutils -# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -489,7 +519,7 @@ Summary: C Library (newlib) for m32r-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} %description -n rtems-4.10-m32r-rtems4.10-newlib diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec index 3b45ceafef..8a225f6892 100644 --- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-m68k-rtems4.10-gcc Summary: m68k-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-m68k-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m68k-rtems4.10-binutils -Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m68k-rtems4.10-binutils -# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for m68k-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for m68k-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec index 9bd089f1f8..32183fe99b 100644 --- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-mips-rtems4.10-gcc Summary: mips-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-mips-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-mips-rtems4.10-binutils -Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-mips-rtems4.10-binutils -# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for mips-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for mips-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec index 302f3629cb..258c322bfd 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-powerpc-rtems4.10-gcc Summary: powerpc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-powerpc-rtems4.10-binutils -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-powerpc-rtems4.10-binutils -# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for powerpc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec index 2fcfa1da07..dd5c45617c 100644 --- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-sh-rtems4.10-gcc Summary: sh-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-sh-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sh-rtems4.10-binutils -Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-sh-rtems4.10-binutils -# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for sh-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for sh-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec index 7e69efca9b..cae4f60b93 100644 --- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec @@ -53,14 +53,12 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define mpfr_version 2.3.1 - Name: rtems-4.10-sparc-rtems4.10-gcc Summary: sparc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,20 +68,52 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc %if "%{gcc_version}" >= "4.3.0" -BuildRequires: gmp-devel >= 4.1 +%define _gmp_minvers 4.1 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif + +%if %{defined _gmp_minvers} +BuildRequires: gmp-devel >= %{_gmp_minvers} %if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel -BuildRequires: %{_host_rpmprefix}mpfr-devel +BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif -%if 0%{?fedora} >= 8 -BuildRequires: mpfr-devel >= 2.3.0 %endif -%if "%{?suse}" > "10.3" -BuildRequires: mpfr-devel >= 2.3.0 + + +%if "%{gcc_version}" >= "4.4.0" +%define _mpfr_minvers 2.3.2 +%define mpfr_version 2.4.1 +%else +%if "%{gcc_version}" >= "4.3.0" +%define _mpfr_minvers 2.3.1 +%define mpfr_version 2.3.2 +%else +%if "%{gcc_version}" >= "4.2.0" +%endif +%endif +%endif + +%if %{defined _mpfr_minvers} +%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc9:%global mpfr_provided 2.3.1} +%{?fc10:%global mpfr_provided 2.3.2} +%{?fc11:%global mpfr_provided 2.4.1} + +%if %{defined mpfr_provided} +%if "%{mpfr_provided}" < "%{_mpfr_minvers}" +%define _build_mpfr 1 +%else +BuildRequires: mpfr-devel >= %{_mpfr_minvers} +%endif +%else +%define _build_mpfr 1 +%endif + +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers} %endif -# These distros ship an insufficient mpfr -%{?el4:%define _build_mpfr 1} -%{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" @@ -100,7 +130,7 @@ BuildRequires: rtems-4.10-sparc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sparc-rtems4.10-binutils -Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-35%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-36%{?dist} %if "%{gcc_version}" >= "3.4" @@ -441,7 +471,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-sparc-rtems4.10-binutils -# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-35%{?dist} +# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-36%{?dist} # License: GPL # %if %build_infos @@ -593,7 +623,7 @@ Summary: C Library (newlib) for sparc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} Requires: rtems-4.10-newlib-common @@ -613,7 +643,7 @@ Newlib C Library for sparc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 35%{?dist} +Release: 36%{?dist} License: Distributable Requires(post): /sbin/install-info |