[rtems-crossrpms commit] Add fc20.
Ralf Corsepius
ralf at rtems.org
Wed Nov 20 18:37:20 UTC 2013
Module: rtems-crossrpms
Branch: rtems-4-10-branch
Commit: bfd89ade349946db79700a26940f7f784f670d7a
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=bfd89ade349946db79700a26940f7f784f670d7a
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Wed Aug 28 05:16:29 2013 +0200
Add fc20.
Drop suse-12.1, fc17.
---
gcc/gccnewlib.add | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/gcc/gccnewlib.add b/gcc/gccnewlib.add
index d5ae373..e5f7a59 100644
--- a/gcc/gccnewlib.add
+++ b/gcc/gccnewlib.add
@@ -16,11 +16,14 @@ Version: %{gcc_rpmvers}
Release: @GCC_RPMREL@
License: GPL
URL: http://gcc.gnu.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
%define _use_internal_dependency_generator 0
BuildRequires: %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires: %{_host_rpmprefix}gcc-c++
+%endif
# FIXME: Disable lto for now, to avoid dependencies on libelf
%bcond_with lto
@@ -55,6 +58,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global libelf_version 0.8.13
# versions of libraries these distros are known to ship
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
%if 0%{?fc19}
%global mpc_provided 1.0.1
%global mpfr_provided 3.1.1
@@ -67,12 +76,6 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 5.0.5
%endif
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
%if 0%{?el6}
%global mpc_provided 0.8
%global mpfr_provided 2.4.1
@@ -97,12 +100,6 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 5.0.5
%endif
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
%if 0%{?cygwin}
%global mpc_provided 0.8
%global mpfr_provided 2.4.1
@@ -203,6 +200,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
%if "%{_build}" != "%{_host}"
BuildRequires: @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires: @rpmprefix@@tool_target at -gcc-c++ = %{gcc_rpmvers}
+%endif
%endif
# Not strictly required, but patches may introduce a need to use them.
More information about the vc
mailing list