diff --git a/contrib/crossrpms/freebsd6.4/i586/Makefile.am b/contrib/crossrpms/freebsd6.4/i586/Makefile.am index dff686177b..9c2b5068e8 100644 --- a/contrib/crossrpms/freebsd6.4/i586/Makefile.am +++ b/contrib/crossrpms/freebsd6.4/i586/Makefile.am @@ -18,6 +18,6 @@ BINUTILS_OPTS += GCC_VERS = 4.4.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 0.20091021.1 +GCC_RPMREL = 0.20100317.1 include ../gcc.am GCC_OPTS += --languages=cxx,fortran,objc diff --git a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec b/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec index 12b940210d..59e54a6a06 100644 --- a/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec +++ b/contrib/crossrpms/freebsd6.4/i586/i586-pc-freebsd6.4-gcc.spec @@ -41,7 +41,7 @@ Summary: i586-pc-freebsd6.4 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 0.20091021.1%{?dist} +Release: 0.20100317.1%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,17 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif %endif +%if "%{gcc_version}" >= "4.3.3" +%define _cloog_minvers 0.15 +%endif + +%if %{defined _cloog_minvers} +%{?fc11:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc12:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc13:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?suse11_2:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%{?suse11_1:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%endif %if "%{gcc_version}" >= "4.4.0" %define _mpfr_minvers 2.3.2 @@ -83,9 +94,9 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %if %{defined _mpfr_minvers} # FIXME: This is an ugly cludge -%{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?fc12:%global mpfr_provided 2.4.1} +%{?fc13:%global mpfr_provided 2.4.1} %{?suse11_0:%global mpfr_provided 2.3.1} %{?suse11_1:%global mpfr_provided 2.3.2} %{?suse11_2:%global mpfr_provided 2.4.1} @@ -499,7 +510,7 @@ Version: %{gcc_rpmvers} License: GPL %description -n i586-pc-freebsd6.4-gcc-libstdc++ -%{_summary} +%{summary} %files -n i586-pc-freebsd6.4-gcc-c++ @@ -561,7 +572,7 @@ Version: %{gcc_rpmvers} License: GPL %description -n i586-pc-freebsd6.4-gcc-libgfortran -%{_summary} +%{summary} %files -n i586-pc-freebsd6.4-gcc-libgfortran -f build/files.gfortran %defattr(-,root,root) diff --git a/contrib/crossrpms/freebsd7.2/i586/Makefile.am b/contrib/crossrpms/freebsd7.2/i586/Makefile.am index bb2acd7803..f4ff9172d6 100644 --- a/contrib/crossrpms/freebsd7.2/i586/Makefile.am +++ b/contrib/crossrpms/freebsd7.2/i586/Makefile.am @@ -18,6 +18,6 @@ BINUTILS_OPTS += GCC_VERS = 4.4.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 0.20091021.1 +GCC_RPMREL = 0.20100317.1 include ../gcc.am GCC_OPTS += --languages=cxx,fortran,objc diff --git a/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec b/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec index 1559f606b4..5a60545383 100644 --- a/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec +++ b/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec @@ -41,7 +41,7 @@ Summary: i586-pc-freebsd7.2 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 0.20091021.1%{?dist} +Release: 0.20100317.1%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,17 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif %endif +%if "%{gcc_version}" >= "4.3.3" +%define _cloog_minvers 0.15 +%endif + +%if %{defined _cloog_minvers} +%{?fc11:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc12:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc13:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?suse11_2:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%{?suse11_1:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%endif %if "%{gcc_version}" >= "4.4.0" %define _mpfr_minvers 2.3.2 @@ -83,9 +94,9 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %if %{defined _mpfr_minvers} # FIXME: This is an ugly cludge -%{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?fc12:%global mpfr_provided 2.4.1} +%{?fc13:%global mpfr_provided 2.4.1} %{?suse11_0:%global mpfr_provided 2.3.1} %{?suse11_1:%global mpfr_provided 2.3.2} %{?suse11_2:%global mpfr_provided 2.4.1} @@ -499,7 +510,7 @@ Version: %{gcc_rpmvers} License: GPL %description -n i586-pc-freebsd7.2-gcc-libstdc++ -%{_summary} +%{summary} %files -n i586-pc-freebsd7.2-gcc-c++ @@ -561,7 +572,7 @@ Version: %{gcc_rpmvers} License: GPL %description -n i586-pc-freebsd7.2-gcc-libgfortran -%{_summary} +%{summary} %files -n i586-pc-freebsd7.2-gcc-libgfortran -f build/files.gfortran %defattr(-,root,root) diff --git a/contrib/crossrpms/freebsd8.0/i586/Makefile.am b/contrib/crossrpms/freebsd8.0/i586/Makefile.am index 5fa6231230..3f24138da8 100644 --- a/contrib/crossrpms/freebsd8.0/i586/Makefile.am +++ b/contrib/crossrpms/freebsd8.0/i586/Makefile.am @@ -18,6 +18,6 @@ BINUTILS_OPTS += GCC_VERS = 4.4.2 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 0.20091021.1 +GCC_RPMREL = 0.20010317.1 include ../gcc.am GCC_OPTS += --languages=cxx,fortran,objc diff --git a/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-gcc.spec b/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-gcc.spec index f4874ec1a9..2d42f7d9a1 100644 --- a/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-gcc.spec +++ b/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-gcc.spec @@ -41,7 +41,7 @@ Summary: i586-pc-freebsd8.0 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 0.20091021.1%{?dist} +Release: 0.20010317.1%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,17 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif %endif +%if "%{gcc_version}" >= "4.3.3" +%define _cloog_minvers 0.15 +%endif + +%if %{defined _cloog_minvers} +%{?fc11:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc12:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc13:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?suse11_2:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%{?suse11_1:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%endif %if "%{gcc_version}" >= "4.4.0" %define _mpfr_minvers 2.3.2 @@ -83,9 +94,9 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %if %{defined _mpfr_minvers} # FIXME: This is an ugly cludge -%{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?fc12:%global mpfr_provided 2.4.1} +%{?fc13:%global mpfr_provided 2.4.1} %{?suse11_0:%global mpfr_provided 2.3.1} %{?suse11_1:%global mpfr_provided 2.3.2} %{?suse11_2:%global mpfr_provided 2.4.1} @@ -499,7 +510,7 @@ Version: %{gcc_rpmvers} License: GPL %description -n i586-pc-freebsd8.0-gcc-libstdc++ -%{_summary} +%{summary} %files -n i586-pc-freebsd8.0-gcc-c++ @@ -561,7 +572,7 @@ Version: %{gcc_rpmvers} License: GPL %description -n i586-pc-freebsd8.0-gcc-libgfortran -%{_summary} +%{summary} %files -n i586-pc-freebsd8.0-gcc-libgfortran -f build/files.gfortran %defattr(-,root,root) diff --git a/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am b/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am index 52e6bf787d..088ed4d849 100644 --- a/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am +++ b/contrib/crossrpms/netbsd5.0.1/i386/Makefile.am @@ -18,7 +18,7 @@ BINUTILS_OPTS += GCC_VERS = 4.3.4 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 0.20090831.1 +GCC_RPMREL = 0.20100317.1 include ../gcc.am # C only # GCC_OPTS += --languages=cxx diff --git a/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-gcc.spec b/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-gcc.spec index e726b63539..b16e673a3f 100644 --- a/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-gcc.spec +++ b/contrib/crossrpms/netbsd5.0.1/i386/i386-pc-netbsdelf5.0.1-gcc.spec @@ -41,7 +41,7 @@ Summary: i386-pc-netbsdelf5.0.1 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 0.20090831.1%{?dist} +Release: 0.20100317.1%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +64,17 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif %endif +%if "%{gcc_version}" >= "4.3.3" +%define _cloog_minvers 0.15 +%endif + +%if %{defined _cloog_minvers} +%{?fc11:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc12:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?fc13:BuildRequires: cloog-ppl-devel >= %_cloog_minvers} +%{?suse11_2:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%{?suse11_1:BuildRequires: cloog-devel >= %_cloog_minvers, ppl-devel} +%endif %if "%{gcc_version}" >= "4.4.0" %define _mpfr_minvers 2.3.2 @@ -80,11 +91,12 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %if %{defined _mpfr_minvers} # FIXME: This is an ugly cludge -%{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} -%{?suse10_3:%global mpfr_provided 2.2.1} +%{?fc12:%global mpfr_provided 2.4.1} +%{?fc13:%global mpfr_provided 2.4.1} %{?suse11_0:%global mpfr_provided 2.3.1} %{?suse11_1:%global mpfr_provided 2.3.2} +%{?suse11_2:%global mpfr_provided 2.4.1} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -263,8 +275,7 @@ Cross gcc for i386-pc-netbsdelf5.0.1. TGTDIR="%{_gcclibdir}/gcc/i386-pc-netbsdelf5.0.1/%{gcc_version}" for i in $multilibs; do case $i in - \.) echo "%dir ${TGTDIR}" >> dirs - ;; + \.) ;; # ignore, handled elsewhere *) echo "%dir ${TGTDIR}/$i" >> dirs ;; esac