From da3d35840f6e277967a39cacbda3b7ba5c167983 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 21 Jul 2009 12:26:01 +0000
Subject: Sync with rtems-4.10.

---
 contrib/crossrpms/binutils/binutils.add |  4 +---
 contrib/crossrpms/common/common.add     | 32 ++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
index ed5f272c34..f1ca500e8a 100644
--- a/contrib/crossrpms/binutils/binutils.add
+++ b/contrib/crossrpms/binutils/binutils.add
@@ -11,9 +11,7 @@ License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_build}" != "%{_host}"
-BuildRequires:	@rpmprefix@%{_host}-gcc
-%endif
+BuildRequires:	%{_host_rpmprefix}gcc
 
 %if "%{binutils_version}" >= "2.18"
 # Bug in bfd: Doesn't build without texinfo installed
diff --git a/contrib/crossrpms/common/common.add b/contrib/crossrpms/common/common.add
index 2d62173388..e354c73ea6 100644
--- a/contrib/crossrpms/common/common.add
+++ b/contrib/crossrpms/common/common.add
@@ -4,25 +4,45 @@
 #
 
 %if "%{_prefix}" != "/usr"
-%define _prefix			@_prefix@
-%define _infodir		%{_prefix}/info
-%define _mandir			%{_prefix}/man
+%define _prefix                 @_prefix@
+%define _exec_prefix            %{_prefix}
+%define _bindir                 %{_exec_prefix}/bin
+%define _sbindir                %{_exec_prefix}/sbin
+%define _libexecdir             %{_exec_prefix}/libexec
+%define _datarootdir            %{_prefix}/share
+%define _datadir                %{_datarootdir}
+%define _sysconfdir             %{_prefix}/etc
+%define _sharedstatedir         %{_prefix}/com
+%define _localstatedir          %{_prefix}/var
+%define _includedir             %{_prefix}/include
+%define _libdir                 %{_exec_prefix}/%{_lib}
+%define _mandir                 %{_datarootdir}/man
+%define _infodir                %{_datarootdir}/info
+%define _localedir              %{_datarootdir}/locale
 %endif
 
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
+%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
-%define debug_package		%{nil}
+%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}"
-%define _host_rpmprefix @rpmprefix@%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
-- 
cgit v1.2.3