diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.10/avr')
-rw-r--r-- | contrib/crossrpms/rtems4.10/avr/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/crossrpms/rtems4.10/avr/gcc-sources.add | 21 | ||||
-rw-r--r-- | contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec | 22 |
3 files changed, 18 insertions, 29 deletions
diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am index 8620fe2f18..4f5ec4638c 100644 --- a/contrib/crossrpms/rtems4.10/avr/Makefile.am +++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am @@ -11,8 +11,8 @@ include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.4.2 -GCC_PKGVERS = $(GCC_VERS)-RC-20091008 -GCC_RPMREL = 1 +GCC_PKGVERS = $(GCC_VERS) +GCC_RPMREL = 2 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr 58 + $(GCC_RPMREL)` diff --git a/contrib/crossrpms/rtems4.10/avr/gcc-sources.add b/contrib/crossrpms/rtems4.10/avr/gcc-sources.add index 051a633408..9af422f089 100644 --- a/contrib/crossrpms/rtems4.10/avr/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/avr/gcc-sources.add @@ -1,40 +1,33 @@ %if "%{gcc_version}" == "4.4.2" -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20091009.diff -%endif -%if "%{gcc_version}" == "4.4.1" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20091015.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx %if "%{gcc_version}" == "4.4.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/snapshots/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.4.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif %{?_without_sources:NoSource: 1} %endif %if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 +Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 %{?_without_sources:NoSource: 2} %endif %if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 +Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2 %{?_without_sources:NoSource: 3} %endif %if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 +Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2 %{?_without_sources:NoSource: 4} %endif %if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 +Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2 %{?_without_sources:NoSource: 5} %endif 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 98bf1c022a..3953899153 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 @@ -46,7 +46,7 @@ %endif -%define gcc_pkgvers 4.4.2-RC-20091008 +%define gcc_pkgvers 4.4.2 %define gcc_version 4.4.2 %define gcc_rpmvers %{expand:%(echo "4.4.2" | tr - _ )} @@ -58,7 +58,7 @@ Summary: avr-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) @@ -136,18 +136,14 @@ 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-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-59%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-60%{?dist} %define _gcclibdir %{_prefix}/lib %if "%{gcc_version}" == "4.4.2" -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20091009.diff -%endif -%if "%{gcc_version}" == "4.4.1" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20091015.diff %endif %{?_without_sources:NoSource: 0} @@ -454,7 +450,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}-59%{?dist} +# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-60%{?dist} # License: GPL # %if %build_infos @@ -472,7 +468,7 @@ Summary: libgcc for avr-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-59%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-60%{?dist} License: GPL %description -n rtems-4.10-avr-rtems4.10-gcc-libgcc @@ -587,7 +583,7 @@ Summary: C Library (newlib) for avr-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 59%{?dist} +Release: 60%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -608,7 +604,7 @@ Newlib C Library for avr-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 59%{?dist} +Release: 60%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable |