From ad476d6e5912b6659e43d2df36f2e4c37ef9c4df Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 31 Mar 2008 04:38:55 +0000 Subject: [PATCH] Unconditionally BR: %{_host_rpmprefix}gcc. --- contrib/crossrpms/binutils/binutils.add | 4 +--- contrib/crossrpms/gcc/gccnewlib.add | 7 ++++++- contrib/crossrpms/gdb/gdb.add | 4 +--- 3 files changed, 8 insertions(+), 7 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/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index fa196c0e02..bde2f438ed 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -22,8 +22,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define _use_internal_dependency_generator 0 +BuildRequires: %{_host_rpmprefix}gcc + %if "%{gcc_version}" >= "4.3.0" BuildRequires: gmp-devel >= 4.1 +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}gmp-devel +BuildRequires: %{_host_rpmprefix}mpfr-devel +%endif %if "%{?fedora}" >= "8" BuildRequires: mpfr-devel >= 2.3.0 %endif @@ -37,7 +43,6 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif %if "%{_build}" != "%{_host}" -BuildRequires: @rpmprefix@%{_host}-gcc BuildRequires: @rpmprefix@@tool_target@-gcc %endif diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index 609101c8f3..d4d4669487 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -10,9 +10,7 @@ License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{_build}" != "%{_host}" -BuildRequires: @rpmprefix@%{_host}-gcc -%endif +BuildRequires: %{_host_rpmprefix}gcc %if "%{gdb_version}" >= "6.6" # suse