From 6ea18279d9b85ae63b88935d13662cc7cbac84f6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 24 Jul 2011 05:45:28 +0000 Subject: [PATCH] Remove support for Fedora 13. Support rpmbuild --with iconv. --- contrib/crossrpms/gcc/gccnewlib.add | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 0e636cd821..9d2926aca1 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -37,6 +37,9 @@ BuildRequires: %{_host_rpmprefix}gcc # Should be applicable to gcc >= 4.5.0 %bcond_with gcc_stdint +# EXPERIMENTAL: Enable newlib's iconv +%bcond_with iconv + # versions of libraries, we conditionally bundle if necessary %global mpc_version 0.8.1 %global mpfr_version 2.4.2 @@ -62,12 +65,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -168,7 +165,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}