[rtems-crossrpms commit] Upgrade to gcc-4.7.1.

Ralf Corsepius ralf at rtems.org
Fri Jul 6 06:03:53 UTC 2012


Module:    rtems-crossrpms
Branch:    master
Commit:    a5d540a79b1981b80bb19d75523ad8f073c5618e
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=a5d540a79b1981b80bb19d75523ad8f073c5618e

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Jul  4 06:14:06 2012 +0200

Upgrade to gcc-4.7.1.

---

 freebsd7.3/i586/Makefile.am                 |    4 +-
 freebsd7.3/i586/Makefile.in                 |    4 +-
 freebsd7.3/i586/gcc-sources.add             |   63 ++++++++++++++++++--------
 freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec |   55 ++++++++++++++++-------
 4 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/freebsd7.3/i586/Makefile.am b/freebsd7.3/i586/Makefile.am
index fa4905a..86850bf 100644
--- a/freebsd7.3/i586/Makefile.am
+++ b/freebsd7.3/i586/Makefile.am
@@ -14,8 +14,8 @@ BINUTILS_RPMREL = 0.20111122.0
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.5.2
+GCC_VERS = 4.7.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20120702.0
+GCC_RPMREL = 0.20120703.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx,fortran,objc
diff --git a/freebsd7.3/i586/Makefile.in b/freebsd7.3/i586/Makefile.in
index e0d8db7..d137002 100644
--- a/freebsd7.3/i586/Makefile.in
+++ b/freebsd7.3/i586/Makefile.in
@@ -200,9 +200,9 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/common/clean.add \
 	$(top_srcdir)/binutils/target-binutils.add \
 	$(top_srcdir)/binutils/base-binutils.add
-GCC_VERS = 4.5.2
+GCC_VERS = 4.7.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20120702.0
+GCC_RPMREL = 0.20120703.0
 GCC_OPTS = --languages=cxx,fortran,objc
 GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/gccnewlib.add $(top_srcdir)/gcc/prep.add \
diff --git a/freebsd7.3/i586/gcc-sources.add b/freebsd7.3/i586/gcc-sources.add
index 18c9848..625314d 100644
--- a/freebsd7.3/i586/gcc-sources.add
+++ b/freebsd7.3/i586/gcc-sources.add
@@ -1,37 +1,60 @@
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
+%if "%{gcc_version}" == "4.7.1"
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120627.diff
+%endif
+%if "%{gcc_version}" == "4.7.0"
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
+%endif
+%if "%{gcc_version}" == "4.6.3"
+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.11/gcc-core-4.6.3-rtems4.11-20120303.diff
+%endif
+%if "%{gcc_version}" == "4.6.2"
+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.11/gcc-core-4.6.2-rtems4.11-20120124.diff
+%endif
+%if "%{gcc_version}" == "4.5.4"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
 %endif
-%{?_without_sources:NoSource:	0}
 
+%if "%{gcc_version}" < "4.7.0"
 %if %build_cxx
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
+%if "%{gcc_version}" == "4.6.3"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
+%if "%{gcc_version}" == "4.6.2"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
+%if "%{gcc_version}" == "4.5.4"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
+Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %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
- at PATCH2@
-%{?_without_sources:NoSource:	2}
+Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 
 %endif
 %if %build_gcj
-Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
- at PATCH3@
-%{?_without_sources:NoSource:	3}
+Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
 
 %endif
 %if %build_gnat
-Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
- at PATCH4@
-%{?_without_sources:NoSource:	4}
+Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
 
 %endif
 %if %build_objc
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
- at PATCH5@
-%{?_without_sources:NoSource:	5}
+Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
+
+%endif
+%endif
+%if %build_newlib
+%if "%{newlib_version}" == "1.20.0"
+Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
+Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20120629.diff
+%endif
 %endif
diff --git a/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec b/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec
index f4df779..0495f92 100644
--- a/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec
+++ b/freebsd7.3/i586/i586-pc-freebsd7.3-gcc.spec
@@ -31,9 +31,9 @@
 %endif
 
 
-%define gcc_pkgvers 4.5.2
-%define gcc_version 4.5.2
-%define gcc_rpmvers %{expand:%(echo "4.5.2" | tr - _ )}
+%define gcc_pkgvers 4.7.1
+%define gcc_version 4.7.1
+%define gcc_rpmvers %{expand:%(echo "4.7.1" | tr - _ )}
 
 
 Name:         	i586-pc-freebsd7.3-gcc
@@ -41,7 +41,7 @@ Summary:      	i586-pc-freebsd7.3 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	0.20120702.0%{?dist}
+Release:      	0.20120703.0%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -243,23 +243,46 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 
 %global _gcclibdir %{_prefix}/lib
 
-Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2"
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4.11-20110220.diff
+%if "%{gcc_version}" == "4.7.1"
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120627.diff
+%endif
+%if "%{gcc_version}" == "4.7.0"
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
+%endif
+%if "%{gcc_version}" == "4.6.3"
+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.11/gcc-core-4.6.3-rtems4.11-20120303.diff
+%endif
+%if "%{gcc_version}" == "4.6.2"
+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.11/gcc-core-4.6.2-rtems4.11-20120124.diff
+%endif
+%if "%{gcc_version}" == "4.5.4"
+Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
 %endif
-%{?_without_sources:NoSource:	0}
 
-Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%if "%{gcc_version}" == "4.5.2" 
-Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.2-rtems4.11-20110131.diff
+%if "%{gcc_version}" < "4.7.0"
+%if "%{gcc_version}" == "4.6.3"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
+%if "%{gcc_version}" == "4.6.2"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
+%if "%{gcc_version}" == "4.5.4"
+Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
+Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
-%{?_without_sources:NoSource:	1}
 
-Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	2}
+Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 
-Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-%{?_without_sources:NoSource:	5}
+Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
+
+%endif
 
 %if 0%{?_build_mpfr}
 Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2




More information about the vc mailing list