[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Wed May 23 15:47:11 UTC 2012


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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Sun Apr 29 18:18:17 2012 +0200

Regenerate.

---

 solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec |   40 +++++++++++++++--------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec b/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
index e2ee28c..1e62af9 100644
--- a/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
+++ b/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
@@ -61,11 +61,15 @@ BuildRequires:  %{_host_rpmprefix}gcc
 # Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
 %bcond_with plugin
 
-# EXPERIMENTAL: Use gcc's stdint.h instead of newlib's
+# Use gcc's stdint.h instead of newlib's
 # Should be applicable to gcc >= 4.5.0
+%if "%{gcc_version}" >= "4.5.3"
+%bcond_without gcc_stdint
+%else
 %bcond_with gcc_stdint
+%endif
 
-# EXPERIMENTAL: Enable newlib's iconv
+# Enable newlib's iconv
 %bcond_without iconv
 
 # versions of libraries, we conditionally bundle if necessary
@@ -75,6 +79,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc18}
+%global mpc_provided 0.9
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?fc17}
 %global mpc_provided 0.9
 %global mpfr_provided 3.1.0
@@ -94,7 +104,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
@@ -154,9 +164,14 @@ 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}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
 %{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
 %if "%{_build}" != "%{_host}"
 BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -176,12 +191,6 @@ BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
 %else
 %define _build_gmp 1
 %endif
-
-%if %{defined libelf_required}
-%if "%{libelf_provided}" >= "%{libelf_required}"
-BuildRequires: libelf-devel >= %{libelf_required}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
 %endif
 
 %if %{defined libelf_required}
@@ -197,12 +206,9 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
 
 
 %if %{defined 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
 
 
@@ -620,6 +626,12 @@ libgcc sparc-sun-solaris2.7-gcc.
 %if "%{gcc_version}" < "4.6.0"
 %{_bindir}/sparc-sun-solaris2.7-gccbug
 %endif
+%if "%{gcc_version}" >= "4.7.0"
+# FIXME: To ship or not to ship?
+%{_bindir}/sparc-sun-solaris2.7-gcc-ar%{_exeext}
+%{_bindir}/sparc-sun-solaris2.7-gcc-nm%{_exeext}
+%{_bindir}/sparc-sun-solaris2.7-gcc-ranlib%{_exeext}
+%endif
 
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7




More information about the vc mailing list