Upgrade to gcc-4.3.0-RC-20080222.

This commit is contained in:
Ralf Corsepius
2008-02-27 10:56:11 +00:00
parent 96e2c18f77
commit 4aa20ea8ae
3 changed files with 54 additions and 11 deletions

View File

@@ -10,9 +10,9 @@ BINUTILS_RPMREL = 4%{?dist}
include ../binutils.am include ../binutils.am
BINUTILS_OPTS += BINUTILS_OPTS +=
GCC_VERS = 4.2.3 GCC_VERS = 4.3.0
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = 4.3.0-RC-20080222
GCC_RPMREL = 10%{?dist} GCC_RPMREL = 0.20080222.1%{?dist}
NEWLIB_VERS = 1.16.0 NEWLIB_VERS = 1.16.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -1,11 +1,20 @@
%if "%{gcc_version}" == "4.3.0"
Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
Patch0: gcc-core-%{gcc_pkgvers}-rtems4.9-20080225.diff
%endif
%if "%{gcc_version}" == "4.2.3" %if "%{gcc_version}" == "4.2.3"
Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
Patch0: gcc-core-4.2.3-rtems4.9-20080205.diff Patch0: gcc-core-4.2.3-rtems4.9-20080205.diff
%endif %endif
%{?_without_sources:NoSource: 0} %{?_without_sources:NoSource: 0}
%if %build_cxx %if %build_cxx
Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %if "%{gcc_version}" == "4.3.0"
Source1: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
%endif
%if "%{gcc_version}" == "4.2.3"
Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
%endif
%{?_without_sources:NoSource: 1} %{?_without_sources:NoSource: 1}
%endif %endif

View File

@@ -14,25 +14,39 @@
%endif %endif
%define gcc_pkgvers 4.2.3 %define gcc_pkgvers 4.3.0-RC-20080222
%define gcc_version 4.2.3 %define gcc_version 4.3.0
%define gcc_rpmvers %{expand:%(echo "4.2.3" | tr - _ )} %define gcc_rpmvers %{expand:%(echo "4.3.0" | tr - _ )}
%define newlib_version 1.16.0 %define newlib_version 1.16.0
%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
%define mpfr_version 2.3.1
Name: rtems-4.9-m68k-rtems4.9-gcc Name: rtems-4.9-m68k-rtems4.9-gcc
Summary: m68k-rtems4.9 gcc Summary: m68k-rtems4.9 gcc
Group: Development/Tools Group: Development/Tools
Version: %{gcc_rpmvers} Version: %{gcc_rpmvers}
Release: 10%{?dist} Release: 0.20080222.1%{?dist}
License: GPL License: GPL
URL: http://gcc.gnu.org URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define _use_internal_dependency_generator 0 %define _use_internal_dependency_generator 0
%if "%{gcc_version}" >= "4.3.0"
BuildRequires: gmp-devel >= 4.1
%if "%{?fedora}" >= "8"
BuildRequires: mpfr-devel >= 2.3.0
%endif
%if "%{?suse}" >= "10.3"
BuildRequires: mpfr-devel >= 2.3.0
%endif
# These distros ship an insufficient mpfr
%{?el4:%define _build_mpfr 1}
%endif
%if "%{gcc_version}" >= "4.2.0" %if "%{gcc_version}" >= "4.2.0"
BuildRequires: flex bison BuildRequires: flex bison
%endif %endif
@@ -53,13 +67,22 @@ Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-%{release}
%define gccexec %{_libdir}/gcc-lib %define gccexec %{_libdir}/gcc-lib
%endif %endif
%if "%{gcc_version}" == "4.3.0"
Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
Patch0: gcc-core-%{gcc_pkgvers}-rtems4.9-20080225.diff
%endif
%if "%{gcc_version}" == "4.2.3" %if "%{gcc_version}" == "4.2.3"
Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
Patch0: gcc-core-4.2.3-rtems4.9-20080205.diff Patch0: gcc-core-4.2.3-rtems4.9-20080205.diff
%endif %endif
%{?_without_sources:NoSource: 0} %{?_without_sources:NoSource: 0}
Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %if "%{gcc_version}" == "4.3.0"
Source1: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
%endif
%if "%{gcc_version}" == "4.2.3"
Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
%endif
%{?_without_sources:NoSource: 1} %{?_without_sources:NoSource: 1}
Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
@@ -68,6 +91,10 @@ Patch50: newlib-1.16.0-rtems4.9-20080131.diff
%endif %endif
%{?_without_sources:NoSource: 50} %{?_without_sources:NoSource: 50}
%if "%{gcc_version}" >= "4.3.0"
Source60: http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
%endif
%description %description
Cross gcc for m68k-rtems4.9. Cross gcc for m68k-rtems4.9.
@@ -91,6 +118,13 @@ cd ..
# Copy the C library into gcc's source tree # Copy the C library into gcc's source tree
ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers}
%if 0%{?_build_mpfr}
%setup -q -T -D -n %{name}-%{version} -a60
%{?PATCH60:%patch60 -p1}
# Build mpfr one-tree style
ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
%endif
%if "%{gcc_version}" < "4.1.0" %if "%{gcc_version}" < "4.1.0"
sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \ sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~