diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index e21ad755dd..d0479a6d7d 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -53,6 +53,7 @@ --enable-version-specific-runtime-libs \ --enable-threads \ --with-sysroot=%{_exec_prefix}/@tool_target@/sys-root \ + %{?%with_lto:--enable-lto}%{?!with_lto:--disable-lto} \ %if %build_newlib --enable-newlib-io-c99-formats \ %endif diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 8874014ae8..757e6fcbad 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -46,6 +46,29 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %endif %endif +%if "%{gcc_version}" >= "4.5.0" +%define _mpc_minvers 0.8 +%endif + +%if %{defined _mpc_minvers} +%{?fc12:%global mpc_provided 0.8} +%{?fc13:%global mpc_provided 0.8.1} +%endif + +%if %{defined mpc_provided} +%if "%{mpc_provided}" < "%{_mpc_minvers}" +%define _build_mpc 1 +%else +%if "%{_build}" != "%{_host}" +BuildRequires: %{_host_rpmprefix}mpc-devel >= %{_mpc_minvers} +%else +BuildRequires: libmpc-devel >= %{_mpc_minvers} +%endif +%endif +%else +%define _build_mpc 1 +%endif + %if "%{gcc_version}" >= "4.3.3" %define _cloog_minvers 0.15 %endif @@ -128,9 +151,13 @@ Requires: @rpmprefix@@tool_target@-gcc-libgcc = %{gcc_rpmvers}-%{release} Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@ %endif +%if "%{gcc_version}" >= "4.5.0" +BuildRequires: zlib-devel +%else %if %build_gcj BuildRequires: zlib-devel %endif +%endif %if %build_gnat # Building gnat requires gnat BuildRequires: gcc-gnat @@ -153,6 +180,10 @@ Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.g Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 %endif +%if 0%{_build_libelf} +Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz +%endif + %description Cross gcc for @tool_target@.