[rtems-crossrpms commit] cygwin-1.7.13-1.

[Ralf Corsepius]

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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Fri Apr 13 07:24:28 2012 +0200

cygwin-1.7.13-1.

---

 cygwin/i686/Makefile.am              |    4 ++--
 cygwin/i686/Makefile.in              |    4 ++--
 cygwin/i686/i686-pc-cygwin-gcc.spec  |   34 ++++++++++++++++++++++++++--------
 cygwin/i686/i686-pc-cygwin-libs.spec |    6 +++---
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 790b429..70b744d 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -4,8 +4,8 @@ TARGET = i686-pc-cygwin
 
 include $(top_srcdir)/mkspec.am
 
-CYGWIN_VERS = 1.7.9-1
-CYGWIN_RPMREL = 0.20110427.0%{?dist}
+CYGWIN_VERS = 1.7.13-1
+CYGWIN_RPMREL = 0.20120413.0%{?dist}
 include ../cygwin.am
 
 CLOOG_PPL_VERS = 0.15.7-1
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index 651cb4d..14358f4 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -216,8 +216,8 @@ MKSPEC0 = sed \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]rtems_api[@]/$(rtems_api)/g"
 
-CYGWIN_VERS = 1.7.9-1
-CYGWIN_RPMREL = 0.20110427.0%{?dist}
+CYGWIN_VERS = 1.7.13-1
+CYGWIN_RPMREL = 0.20120413.0%{?dist}
 LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/libs.add \
 	$(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-libs.add
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index 3485610..49f36cc 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-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
@@ -152,9 +162,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}
@@ -189,12 +204,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
 
 
@@ -625,6 +637,12 @@ libgcc i686-pc-cygwin-gcc.
 %if "%{gcc_version}" < "4.6.0"
 %{_bindir}/i686-pc-cygwin-gccbug
 %endif
+%if "%{gcc_version}" >= "4.7.0"
+# FIXME: To ship or not to ship?
+%{_bindir}/i686-pc-cygwin-gcc-ar%{_exeext}
+%{_bindir}/i686-pc-cygwin-gcc-nm%{_exeext}
+%{_bindir}/i686-pc-cygwin-gcc-ranlib%{_exeext}
+%endif
 
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/i686-pc-cygwin
diff --git a/cygwin/i686/i686-pc-cygwin-libs.spec b/cygwin/i686/i686-pc-cygwin-libs.spec
index d84d0d4..052b593 100644
--- a/cygwin/i686/i686-pc-cygwin-libs.spec
+++ b/cygwin/i686/i686-pc-cygwin-libs.spec
@@ -30,11 +30,11 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define cygwin_version 1.7.9-1
-%define cygwin_rpmvers %{expand:%(echo 1.7.9-1 | tr - _)} 
+%define cygwin_version 1.7.13-1
+%define cygwin_rpmvers %{expand:%(echo 1.7.13-1 | tr - _)} 
 
 Name:         i686-pc-cygwin
-Release:      0.20110427.0%{?dist}
+Release:      0.20120413.0%{?dist}
 License:      GPL
 Group:        Development/Tools