From 55e9fcaefa7247b88ddcebb6212543cda743f4c3 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 18 Jun 2007 10:32:03 +0000 Subject: Preps for next spin. --- contrib/crossrpms/rtems4.8/sh/Makefile.am | 2 +- contrib/crossrpms/rtems4.8/sh/gcc-sources.add | 10 ++++++++-- .../crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec | 13 ++++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) (limited to 'contrib/crossrpms/rtems4.8/sh') diff --git a/contrib/crossrpms/rtems4.8/sh/Makefile.am b/contrib/crossrpms/rtems4.8/sh/Makefile.am index 9f42ef09fa..ce7cb75aed 100644 --- a/contrib/crossrpms/rtems4.8/sh/Makefile.am +++ b/contrib/crossrpms/rtems4.8/sh/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.1.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 12 +GCC_RPMREL = 13 NEWLIB_VERS = 1.15.0 include ../gcc.am GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/rtems4.8/sh/gcc-sources.add b/contrib/crossrpms/rtems4.8/sh/gcc-sources.add index b256f2820d..cce97805e1 100644 --- a/contrib/crossrpms/rtems4.8/sh/gcc-sources.add +++ b/contrib/crossrpms/rtems4.8/sh/gcc-sources.add @@ -1,12 +1,18 @@ -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 %if "%{gcc_version}" == "4.0.3" +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 Patch0: gcc-core-4.0.3-rtems-20060822.diff %endif %if "%{gcc_version}" == "4.1.1" +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 Patch0: gcc-core-4.1.1-rtems4.8-20070201.diff %endif %if "%{gcc_version}" == "4.1.2" -Patch0: gcc-core-4.1.2-rtems4.8-20070216.diff +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: gcc-core-4.1.2-rtems4.8-20070613.diff +%endif +%if "%{gcc_version}" == "4.2.0" +Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff %endif %{?_without_sources:NoSource: 0} diff --git a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec index 0cec1bd3ed..2a0ea0d295 100644 --- a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec +++ b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gcc.spec @@ -26,7 +26,7 @@ Summary: sh-rtems4.8 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 12%{?dist} +Release: 13%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,15 +53,21 @@ Requires: rtems-4.8-sh-rtems4.8-newlib = %{newlib_version}-%{release} %define gccexec %{_libdir}/gcc-lib %endif -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 %if "%{gcc_version}" == "4.0.3" +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 Patch0: gcc-core-4.0.3-rtems-20060822.diff %endif %if "%{gcc_version}" == "4.1.1" +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 Patch0: gcc-core-4.1.1-rtems4.8-20070201.diff %endif %if "%{gcc_version}" == "4.1.2" -Patch0: gcc-core-4.1.2-rtems4.8-20070216.diff +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: gcc-core-4.1.2-rtems4.8-20070613.diff +%endif +%if "%{gcc_version}" == "4.2.0" +Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff %endif %{?_without_sources:NoSource: 0} @@ -133,6 +139,7 @@ cd .. --datadir=%{_datadir} \ --build=%_build --host=%_host \ --target=sh-rtems4.8 \ + --disable-libstdcxx-pch \ --with-gnu-as --with-gnu-ld --verbose \ --with-newlib \ --with-system-zlib \ -- cgit v1.2.3