[rtems-crossrpms commit] cloog-ppl-0.15.11-1.

Ralf Corsepius ralf at rtems.org
Thu Jan 30 18:03:13 UTC 2014


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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Dec  9 04:42:03 2013 +0100

cloog-ppl-0.15.11-1.

---

 cygwin/i686/Makefile.am                   |    4 ++--
 cygwin/i686/Makefile.in                   |    4 ++--
 cygwin/i686/cloog-ppl.add                 |    8 ++++----
 cygwin/i686/i686-pc-cygwin-cloog-ppl.spec |   14 +++++++-------
 cygwin/i686/i686-pc-cygwin-gcc.spec       |   26 +++++++++++++++++++++-----
 5 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 0981ac4..b7eb0bb 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -6,8 +6,8 @@ CYGWIN_VERS = 1.7.26-1
 CYGWIN_RPMREL = 0.20131209.0%{?dist}
 include ../cygwin.am
 
-CLOOG_PPL_VERS = 0.15.7-1
-CLOOG_PPL_RPMREL = 0.20121216.0%{?dist}
+CLOOG_PPL_VERS = 0.15.11-1
+CLOOG_PPL_RPMREL = 0.20131209.0%{?dist}
 include ../cloog_ppl.am
 
 W32API_VERS = 3.17-2
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index 67e1e01..4426eb8 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -259,8 +259,8 @@ CYGWIN_RPMREL = 0.20131209.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
-CLOOG_PPL_VERS = 0.15.7-1
-CLOOG_PPL_RPMREL = 0.20121216.0%{?dist}
+CLOOG_PPL_VERS = 0.15.11-1
+CLOOG_PPL_RPMREL = 0.20131209.0%{?dist}
 CLOOG_PPL_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/cloog-ppl.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-cloog-ppl.add
diff --git a/cygwin/i686/cloog-ppl.add b/cygwin/i686/cloog-ppl.add
index 54b69ca..e38a2c7 100644
--- a/cygwin/i686/cloog-ppl.add
+++ b/cygwin/i686/cloog-ppl.add
@@ -6,15 +6,15 @@ Release:      @CLOOG_PPL_RPMREL@
 License:      GPL
 Group:        Development/Tools
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 BuildArch:	noarch
 
 Version:      	%cloog_ppl_rpmvers
 Summary:      	Cygwin cloog-ppl Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/cloog-ppl-%{cloog_ppl_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog0/libcloog0-%{cloog_ppl_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog-devel/libcloog-devel-%{cloog_ppl_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/cloog-ppl/cloog-ppl-%{cloog_ppl_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/cloog-ppl/libcloog0/libcloog0-%{cloog_ppl_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/cloog-ppl/libcloog-devel/libcloog-devel-%{cloog_ppl_version}.tar.bz2
 
 Provides:	@rpmprefix@@tool_target at -cloog-ppl = %{version}-%{release}
 Provides:       @rpmprefix@@tool_target at -cloog-ppl-devel = %{version}-%{release}
diff --git a/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec b/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
index de1cab6..df38004 100644
--- a/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
+++ b/cygwin/i686/i686-pc-cygwin-cloog-ppl.spec
@@ -31,23 +31,23 @@
 %endif
 
 %{?!el5:%global _with_noarch_subpackages 1}
-%define cloog_ppl_version 0.15.7-1
-%define cloog_ppl_rpmvers %{expand:%(echo 0.15.7-1 | tr - _)} 
+%define cloog_ppl_version 0.15.11-1
+%define cloog_ppl_rpmvers %{expand:%(echo 0.15.11-1 | tr - _)} 
 
 Name:         i686-pc-cygwin-cloog-ppl
-Release:      0.20121216.0%{?dist}
+Release:      0.20131209.0%{?dist}
 License:      GPL
 Group:        Development/Tools
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 BuildArch:	noarch
 
 Version:      	%cloog_ppl_rpmvers
 Summary:      	Cygwin cloog-ppl Libraries
 
-Source0:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/cloog-ppl-%{cloog_ppl_version}.tar.bz2
-Source1:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog0/libcloog0-%{cloog_ppl_version}.tar.bz2
-Source2:	ftp://cygwin.com/pub/cygwin/release/cloog-ppl/libcloog-devel/libcloog-devel-%{cloog_ppl_version}.tar.bz2
+Source0:	ftp://cygwin.com/pub/cygwin/x86/release/cloog-ppl/cloog-ppl-%{cloog_ppl_version}.tar.bz2
+Source1:	ftp://cygwin.com/pub/cygwin/x86/release/cloog-ppl/libcloog0/libcloog0-%{cloog_ppl_version}.tar.bz2
+Source2:	ftp://cygwin.com/pub/cygwin/x86/release/cloog-ppl/libcloog-devel/libcloog-devel-%{cloog_ppl_version}.tar.bz2
 
 Provides:	i686-pc-cygwin-cloog-ppl = %{version}-%{release}
 Provides:       i686-pc-cygwin-cloog-ppl-devel = %{version}-%{release}
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index 6211213..22d8a26 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -77,12 +77,18 @@ BuildRequires:  %{_host_rpmprefix}gcc-c++
 %bcond_without iconv
 
 # versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
+%global mpc_version	1.0.1
+%global mpfr_version	3.1.2
+%global gmp_version	5.1.2
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc21}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc20}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.2
@@ -113,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc-c++
 %global gmp_provided 4.1.4
 %endif
 
+%if 0%{?suse13_1}
+%global mpc_provided 1.0
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?suse12_3}
 %global mpc_provided 1.0
 %global mpfr_provided 3.1.1
@@ -153,6 +165,10 @@ BuildRequires:  %{_host_rpmprefix}gcc-c++
 %define mpfr_required		2.3.2
 %endif
 
+%if "%{gcc_version}" >= "4.8.0"
+%define mpfr_required		2.4.0
+%endif
+
 %if "%{gcc_version}" >= "4.5.0"
 %define mpc_required 		0.8
 %if %{with lto}
@@ -271,7 +287,7 @@ Patch71: cygwin-gcc4-4.3.4-3.diff
 %endif
 
 %if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.%{?el5:bz2}%{!?el5:xz}
 %endif
 
 %if 0%{?_build_mpc}
@@ -279,7 +295,7 @@ Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.g
 %endif
 
 %if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.%{?el5:bz2}%{!?el5:xz}
 %endif
 
 %if 0%{?_build_libelf}




More information about the vc mailing list