From 35381baa883d616c48403a1e3f14f11c68872a9e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 26 Jan 2009 07:17:37 +0000 Subject: BR: exact version of build host tools for Cdn-X builds. --- .../m32c/rtems-4.10-m32c-rtems4.10-gcc.spec | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec') diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec index ed51edfa60..1197968703 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec @@ -21,14 +21,22 @@ %ifos cygwin cygwin32 mingw mingw32 %define _exeext .exe -%define debug_package %{nil} +%define debug_package %{nil} +%define _libdir %{_exec_prefix}/lib %else %define _exeext %{nil} %endif %ifos cygwin cygwin32 %define optflags -O3 -pipe -march=i486 -funroll-loops -%define _libdir %{_exec_prefix}/lib +%endif + +%ifos mingw mingw32 +%if %{defined _mingw32_cflags} +%define optflags %{_mingw32_cflags} +%else +%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields +%endif %endif %if "%{_build}" != "%{_host}" @@ -44,7 +52,7 @@ %define newlib_pkgvers 1.17.0 %define newlib_version 1.17.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} +%define newlib_release 21%{?dist} %define mpfr_version 2.3.1 @@ -53,7 +61,7 @@ Summary: m32c-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 21%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,12 +84,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.10-m32c-rtems4.10-gcc +BuildRequires: rtems-4.10-m32c-rtems4.10-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -93,7 +100,7 @@ BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-m32c-rtems4.10-binutils -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{release} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{newlib_release} %if "%{gcc_version}" >= "3.4" @@ -415,7 +422,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32c-rtems4.10-binutils -# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-%{newlib_release} # License: GPL # %if %build_infos @@ -474,9 +481,7 @@ Summary: C Library (newlib) for m32c-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.10-m32c-rtems4.10-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.10-m32c-rtems4.10-libc < %{newlib_version}-%{release} +Release: %{newlib_release} %description -n rtems-4.10-m32c-rtems4.10-newlib -- cgit v1.2.3