From e9fd94cea582b320265d6a10595ac8d4d04e1b78 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 21 Jan 2010 14:59:53 +0000 Subject: Upgrade to gcc-4.4.3. --- contrib/crossrpms/rtems4.10/powerpc/Makefile.am | 4 ++-- .../powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec | 28 +++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'contrib/crossrpms/rtems4.10/powerpc') diff --git a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am index 72aa726099..7dbe8e5ca2 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am @@ -11,8 +11,8 @@ include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.4.3 -GCC_PKGVERS = $(GCC_VERS)-RC-20100116 -GCC_RPMREL = 1 +GCC_PKGVERS = $(GCC_VERS) +GCC_RPMREL = 2 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 1` 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 4d38391ef4..7798e7e156 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 @@ -46,7 +46,7 @@ %endif -%define gcc_pkgvers 4.4.3-RC-20100116 +%define gcc_pkgvers 4.4.3 %define gcc_version 4.4.3 %define gcc_rpmvers %{expand:%(echo "4.4.3" | tr - _ )} @@ -58,7 +58,7 @@ Summary: powerpc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,6 +81,17 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif %endif +%if "%{gcc_version}" >= "4.3.3" +%define _cloog_minvers 0.15 +%endif + +%if %{defined _cloog_minvers} +%{?fc11:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc12:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc13:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?suse11_2:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%{?suse11_1:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%endif %if "%{gcc_version}" >= "4.4.0" %define _mpfr_minvers 2.3.2 @@ -99,6 +110,7 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} # FIXME: This is an ugly cludge %{?fc11:%global mpfr_provided 2.4.1} %{?fc12:%global mpfr_provided 2.4.1} +%{?fc13:%global mpfr_provided 2.4.1} %{?suse11_0:%global mpfr_provided 2.3.1} %{?suse11_1:%global mpfr_provided 2.3.2} %{?suse11_2:%global mpfr_provided 2.4.1} @@ -136,7 +148,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-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-2%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-3%{?dist} %define _gcclibdir %{_prefix}/lib @@ -199,7 +211,7 @@ cd .. ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-2%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-3%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -458,7 +470,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}-2%{?dist} +# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-3%{?dist} # License: GPL # %if %build_infos @@ -476,7 +488,7 @@ Summary: libgcc for powerpc-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-2%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-3%{?dist} License: GPL %description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc @@ -651,7 +663,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 2%{?dist} +Release: 3%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -672,7 +684,7 @@ Newlib C Library for powerpc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 2%{?dist} +Release: 3%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable -- cgit v1.2.3