[rtems-crossrpms commit] Regenerate.
Ralf Corsepius
ralf at rtems.org
Wed Mar 28 15:15:45 UTC 2012
Module: rtems-crossrpms
Branch: master
Commit: c563741f441cc7d96a25e57f7f9ecffde07c5583
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=c563741f441cc7d96a25e57f7f9ecffde07c5583
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Sat Mar 24 06:29:18 2012 +0100
Regenerate.
---
.../arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec | 40 +++++++++++++-------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec b/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec
index 6af8976..fbe6981 100644
--- a/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec
+++ b/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gcc.spec
@@ -58,7 +58,7 @@ Summary: arm-rtemseabi4.11 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)
@@ -117,7 +117,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -175,6 +175,10 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%endif
+%if "%{gcc_version}" >= "4.7.0"
+%define gmp_required 4.2
+%endif
+
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
@@ -212,13 +216,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -247,7 +247,7 @@ BuildRequires: rtems-4.11-arm-rtemseabi4.11-binutils
Requires: rtems-4.11-gcc-common
Requires: rtems-4.11-arm-rtemseabi4.11-binutils
Requires: rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-5%{?dist}
+Requires: rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-6%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -259,6 +259,10 @@ BuildRequires: %{_host_rpmprefix}zlib-devel
%global _gcclibdir %{_prefix}/lib
+%if "%{gcc_version}" == "4.7.0"
+Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.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
@@ -272,6 +276,7 @@ Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.ta
Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.3-rtems4.11-20110905.diff
%endif
+%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
@@ -283,6 +288,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar
Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-20110905.diff
%endif
+%endif
%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-20120217.diff
@@ -369,7 +375,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-5%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-6%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -654,7 +660,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.11-arm-rtemseabi4.11-binutils
-# Requires: rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-5%{?dist}
+# Requires: rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-6%{?dist}
# License: GPL
# %if %build_infos
@@ -672,7 +678,7 @@ Summary: libgcc for arm-rtemseabi4.11-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-5%{?dist}
+Requires: rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-6%{?dist}
License: GPL
%description -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
@@ -697,6 +703,12 @@ libgcc arm-rtemseabi4.11-gcc.
%if "%{gcc_version}" < "4.6.0"
%{_bindir}/arm-rtemseabi4.11-gccbug
%endif
+%if "%{gcc_version}" >= "4.7.0"
+# FIXME: To ship or not to ship?
+%{_bindir}/arm-rtemseabi4.11-gcc-ar%{_exeext}
+%{_bindir}/arm-rtemseabi4.11-gcc-nm%{_exeext}
+%{_bindir}/arm-rtemseabi4.11-gcc-ranlib%{_exeext}
+%endif
%dir %{_libexecdir}
%dir %{_libexecdir}/gcc
@@ -851,7 +863,7 @@ Summary: C Library (newlib) for arm-rtemseabi4.11
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.11-newlib-common
@@ -872,7 +884,7 @@ Newlib C Library for arm-rtemseabi4.11.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
More information about the vc
mailing list