diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.9/m68k')
| -rw-r--r-- | contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec | 38 | ||||
| -rw-r--r-- | contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec | 12 |
2 files changed, 37 insertions, 13 deletions
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec index 9d26fcf7d8..cf09b93420 100644 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec @@ -13,6 +13,18 @@ %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 + +%if "%{_build}" != "%{_host}" +%define _host_rpmprefix rtems-4.9-%{_host}- +%else +%define _host_rpmprefix %{nil} +%endif + %define gcc_pkgvers 4.3.0 %define gcc_version 4.3.0 @@ -28,15 +40,21 @@ Summary: m68k-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 11%{?dist} +Release: 12%{?dist} License: GPL URL: http://gcc.gnu.org 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 @@ -49,6 +67,10 @@ BuildRequires: mpfr-devel >= 2.3.0 %{?suse10_3:%define _build_mpfr 1} %endif +%if "%{_build}" != "%{_host}" +BuildRequires: rtems-4.9-m68k-rtems4.9-gcc +%endif + %if "%{gcc_version}" >= "4.2.0" BuildRequires: flex bison %endif @@ -72,7 +94,7 @@ Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-%{release} %if "%{gcc_version}" == "4.3.0" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: gcc-core-%{gcc_pkgvers}-rtems4.9-20080306.diff +Patch0: gcc-core-%{gcc_pkgvers}-rtems4.9-20080501.diff %endif %if "%{gcc_version}" == "4.2.3" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -90,7 +112,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.ta Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: newlib-1.16.0-rtems4.9-20080302.diff +Patch50: newlib-1.16.0-rtems4.9-20080430.diff %endif %{?_without_sources:NoSource: 50} @@ -150,8 +172,12 @@ cd .. languages="c" languages="$languages,c++" export PATH="%{_bindir}:${PATH}" - +%if "%{_build}" != "%{_host}" + CFLAGS_FOR_BUILD="-g -O2 -Wall" \ + CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ +%else CC="%{__cc} ${RPM_OPT_FLAGS}" \ +%endif ../gcc-%{gcc_pkgvers}/configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ @@ -422,7 +448,6 @@ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description -n rtems-4.9-gcc-common - GCC files that are shared by all targets. %files -n rtems-4.9-gcc-common @@ -477,6 +502,9 @@ Group: Development/Tools Version: %{gcc_rpmvers} License: GPL +%if "%{_build}" != "%{_host}" +BuildRequires: rtems-4.9-m68k-rtems4.9-gcc-c++ +%endif Provides: rtems-4.9-m68k-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-m68k-rtems4.9-c++ < %{gcc_rpmvers}-%{release} diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec index 9dbf76030a..8d03ee74a9 100644 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec +++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec @@ -32,7 +32,7 @@ Name: rtems-4.9-m68k-rtems4.9-gdb Summary: Gdb for target m68k-rtems4.9 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +53,7 @@ BuildRequires: %{_host_rpmprefix}expat-devel %endif %endif -%if "%{gdb_version}" < "6.6" +%if "%{gdb_version}" < "6.7" %if "%{_build}" != "%{_host}" BuildRequires: %{_host_rpmprefix}termcap-devel %endif @@ -64,9 +64,6 @@ BuildRequires: %{_host_rpmprefix}ncurses-devel # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 -%if "m68k-rtems4.9" == "sparc-rtems4.9" -BuildConflicts: libtermcap-devel termcap-devel -%endif Requires: rtems-4.9-gdb-common @@ -74,7 +71,7 @@ Requires: rtems-4.9-gdb-common Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 %{?_without_sources:NoSource: 0} %if "%{gdb_version}" == "6.8" -Patch0: gdb-6.8-rtems4.9-20080428.diff +Patch0: gdb-6.8-rtems4.9-20080429.diff %endif %description @@ -85,10 +82,9 @@ GDB for target m68k-rtems4.9 %setup -q -D -T -n %{name}-%{version} -a0 cd gdb-%{gdb_version} %{?PATCH0:%patch0 -p1} -%{?PATCH1:%patch1 -p1} cd .. -%if "%{gdb_version}" >= "6.8" +%if "%{gdb_version}" >= "6.7" # Force using a system-provided libreadline rm -f gdb-%{gdb_version}/readline/configure %endif |