i586-pc-freebsd8.0-gcc.spec

2 files changed, 193 insertions, 59 deletions

diff --git a/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-binutils.spec b/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-binutils.spec
index 22dc7ba8b9..9db80fea2c 100644
--- a/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-binutils.spec
+++ b/contrib/crossrpms/freebsd8.0/i586/i586-pc-freebsd8.0-binutils.spec
@@ -49,9 +49,6 @@ BuildRequires:	%{_host_rpmprefix}gcc
 # Bug in bfd: Doesn't build without texinfo installed
 BuildRequires:	texinfo >= 4.2
 %else
-%if "i586-pc-freebsd8.0" == "i686-pc-cygwin"
-BuildRequires:	texinfo >= 4.2
-%endif
 %endif
 BuildRequires:	flex
 BuildRequires:	bison
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 2d42f7d9a1..3abe7863f2 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
@@ -31,9 +31,9 @@
 %endif
 
 
-%define gcc_pkgvers 4.4.2
-%define gcc_version 4.4.2
-%define gcc_rpmvers %{expand:%(echo "4.4.2" | tr - _ )}
+%define gcc_pkgvers 4.5.0
+%define gcc_version 4.5.0
+%define gcc_rpmvers %{expand:%(echo "4.5.0" | tr - _ )}
 
 
 Name:         	i586-pc-freebsd8.0-gcc
@@ -41,7 +41,7 @@ Summary:      	i586-pc-freebsd8.0 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	0.20010317.1%{?dist}
+Release:      	0.20100415.1%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,73 +50,156 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{_host_rpmprefix}gcc
 
-%if "%{gcc_version}" >= "4.3.0"
-%define _gmp_minvers		4.1
-%else
-%if "%{gcc_version}" >= "4.2.0"
-%define _gmp_minvers		4.1
+# FIXME: Disable lto for now, to avoid dependencies on libelf
+%bcond_with lto
+
+# FIXME: Disamble python gdb scripts
+# ATM, no idea how to package them
+%bcond_with pygdb
+
+# FIXME: Disable GCC-plugin
+# Bug in gcc-4.5-20100318, doesn't build them on x86_84 hosts.
+%bcond_with plugin
+
+# versions of libraries, we conditionally bundle if necessary
+%global mpc_version	0.8.1
+%global mpfr_version	2.4.1
+%global gmp_version	4.3.2
+%global libelf_version  0.8.13
+
+# versions of libraries these distros are known to ship
+%if 0%{?fc13}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
 %endif
+
+%if 0%{?fc12}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
 %endif
 
-%if %{defined _gmp_minvers}
-BuildRequires: gmp-devel >= %{_gmp_minvers}
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers}
+%if 0%{?fc11}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.2.4
 %endif
+
+%if 0%{?rhel5}
+%global mpc_provided %{nil}
+%global mpfr_provided %{nil}
+%global gmp_provided 4.1.4
 %endif
 
-%if "%{gcc_version}" >= "4.3.3"
-%define _cloog_minvers 0.15
+%if 0%{?suse11_0}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.3.1
+%global gmp_provided 4.2.2
 %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}
+%if 0%{?suse11_1}
+%global mpc_provided %{nil}
+%global mpfr_provided 2.3.2
+%global gmp_provided 4.2.3
+%endif
+
+%if 0%{?suse11_2}
+%global mpc_provided 0.7
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?cygwin}
+%global mpc_provided 0.8
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.1
+%endif
+
+%if 0%{?mingw32}
+%global mpc_provided 0.8.1
+%global mpfr_provided 2.4.1
+%global gmp_provided 4.3.2
 %endif
 
-%if "%{gcc_version}" >= "4.4.0"
-%define _mpfr_minvers	2.3.2
-%define mpfr_version	2.4.1
-%else
-%if "%{gcc_version}" >= "4.3.0"
-%define _mpfr_minvers	2.3.1
-%define mpfr_version	2.3.2
-%else
 %if "%{gcc_version}" >= "4.2.0"
-%define _mpfr_minvers	2.2.1
-%define mpfr_version	2.3.2
+%define gmp_required		4.1
+%define mpfr_required		2.2.1
 %endif
+
+%if "%{gcc_version}" >= "4.3.0"
+%define gmp_required		4.1
+%define mpfr_required		2.3.1
 %endif
+
+%if "%{gcc_version}" >= "4.3.3"
+%define cloog_required 		0.15
 %endif
 
-%if %{defined _mpfr_minvers}
-# FIXME: This is an ugly cludge
-%{?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}
-%{?cygwin:%global mpfr_provided 2.4.1}
-%{?mingw32:%global mpfr_provided %{nil}}
+%if "%{gcc_version}" >= "4.4.0"
+%define mpfr_required		2.3.2
+%endif
 
-%if %{defined mpfr_provided}
-%if "%{mpfr_provided}" < "%{_mpfr_minvers}"
-%define _build_mpfr 1
+%if "%{gcc_version}" >= "4.5.0"
+%define mpc_required 		0.8
+%if %{with lto}
+%define libelf_required 	0.8.12
+%endif
+%endif
+
+%if %{defined mpc_required}
+%if "%{mpc_provided}" >= "%{mpc_required}"
+%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpc-devel >= %{mpc_required}
+%endif
+%else
+%define _build_mpc 1
+%endif
+%endif
+
+%if %{defined gmp_required}
+%if "%{gmp_provided}" >= "%{gmp_required}"
+BuildRequires: gmp-devel >= %{gmp_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{gmp_required}
+%endif
 %else
+%define _build_gmp 1
+%endif
+%endif
+
+%if %{defined libelf_required}
+%if "%{libelf_provided}" >= "%{libelf_required}"
+BuildRequires: libelf-devel >= %{libelf_required}
 %if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{_mpfr_minvers}
+BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}
+%endif
 %else
-BuildRequires: mpfr-devel >= %{_mpfr_minvers}
+%define _build_libelf 1
 %endif
 %endif
+
+
+%if %{defined cloog_required}
+%{?fc11:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc12:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse11_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%endif
+
+
+%if %{defined mpfr_required}
+%if "%{mpfr_provided}" >= "%{mpfr_required}"
+BuildRequires: mpfr-devel >= %{mpfr_required}
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
+%endif
 %else
 %define _build_mpfr 1
 %endif
-
 %endif
 
 %if "%{_build}" != "%{_host}"
@@ -136,8 +219,15 @@ Requires:	i586-pc-freebsd8.0-binutils
 Requires:	i586-pc-freebsd8.0-sys-root
 Requires:	i586-pc-freebsd8.0-gcc-libgcc = %{gcc_rpmvers}-%{release}
 
+%if "%{gcc_version}" >= "4.5.0"
+BuildRequires:  zlib-devel
+%if "%{_build}" != "%{_host}"
+BuildRequires:  %{_host_rpmprefix}zlib-devel
+%endif
+%else
+%endif
 
-%define _gcclibdir %{_prefix}/lib
+%global _gcclibdir %{_prefix}/lib
 
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	0}
@@ -151,10 +241,22 @@ Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	5}
 
-%if "%{gcc_version}" >= "4.3.0"
+%if 0%{?_build_mpfr}
 Source60:    http://www.mpfr.org/mpfr-current/mpfr-%{mpfr_version}.tar.bz2
 %endif
 
+%if 0%{?_build_mpc}
+Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+
+%if 0%{?_build_gmp}
+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 i586-pc-freebsd8.0.
 
@@ -162,10 +264,14 @@ Cross gcc for i586-pc-freebsd8.0.
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 
 %setup -q -T -D -n %{name}-%{version} -a2
 %{?PATCH2:%patch2 -p0}
@@ -183,6 +289,27 @@ Cross gcc for i586-pc-freebsd8.0.
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
+%if 0%{?_build_mpc}
+%setup -q -T -D -n %{name}-%{version} -a61
+%{?PATCH61:%patch61 -p1}
+  # Build mpc one-tree style
+  ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc
+%endif
+
+%if 0%{?_build_gmp}
+%setup -q -T -D -n %{name}-%{version} -a62
+%{?PATCH62:%patch62 -p1}
+  # Build gmp one-tree style
+  ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp
+%endif
+
+%if 0%{?_build_libelf}
+%setup -q -T -D -n %{name}-%{version} -a63
+%{?PATCH63:%patch63 -p1}
+  # Build libelf one-tree style
+  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
+%endif
+
 
   # Fix timestamps
   cd gcc-%{gcc_pkgvers}
@@ -224,6 +351,8 @@ Cross gcc for i586-pc-freebsd8.0.
     --enable-version-specific-runtime-libs \
     --enable-threads \
     --with-sysroot=%{_exec_prefix}/i586-pc-freebsd8.0/sys-root \
+    %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
+    %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
     --enable-languages="$languages" $optargs
 
 %if "%_host" != "%_build"
@@ -286,6 +415,13 @@ Cross gcc for i586-pc-freebsd8.0.
     rmdir ${RPM_BUILD_ROOT}%{_prefix}/i586-pc-freebsd8.0/include/bits
   fi
 
+  # gcc >= 4.5.0: installs weird libstdc++ python bindings.
+%if ! %{with pygdb}
+  if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then
+    rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx
+  fi
+%endif
+
   # Collect multilib subdirectories
   multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
@@ -331,6 +467,8 @@ Cross gcc for i586-pc-freebsd8.0.
     *jc1) ;;
     *jvgenmain) ;;
     */libgfortran*.*) echo "$i" >> build/files.gfortran ;;
+    %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
+    %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
     */libstdc++.*) echo "$i" >> build/files.g++ ;;
     */libsupc++.*) echo "$i" >> build/files.g++ ;;
     *) echo "$i" >> build/files.gcc ;;
@@ -461,7 +599,10 @@ libgcc i586-pc-freebsd8.0-gcc.
 %dir %{_libexecdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}
 %{_libexecdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/cc1%{_exeext}
 %{_libexecdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/collect2%{_exeext}
-
+%if "%{gcc_version}" >= "4.5.0"
+%{?with_lto:%{_libexecdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/lto-wrapper%{_exeext}
+%endif
 
 %files -n i586-pc-freebsd8.0-gcc-libgcc -f build/files.gcc
 %defattr(-,root,root)
@@ -471,12 +612,8 @@ libgcc i586-pc-freebsd8.0-gcc.
 %dir %{_gcclibdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/include
 
 %if "%{gcc_version}" > "4.0.3"
-%if "i586-pc-freebsd8.0" != "bfin-rtems4.10"
-%if "i586-pc-freebsd8.0" != "avr-rtems4.10"
 %dir %{_gcclibdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/include/ssp
 %endif
-%endif
-%endif
 
 %if "%{gcc_version}" >= "4.3.0"
 %{_gcclibdir}/gcc/i586-pc-freebsd8.0/%{gcc_version}/include-fixed