summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-07-23 08:38:49 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-07-23 08:38:49 +0000
commitaf0717b291215e358fafb002b1154cc04e3d399f (patch)
tree2460994673a2b2af412f384fbba8551fdb114b69
parentRegenerate. (diff)
downloadrtems-af0717b291215e358fafb002b1154cc04e3d399f.tar.bz2
Sync. with rtems-4.10.
-rw-r--r--contrib/crossrpms/gdb/build.add5
-rw-r--r--contrib/crossrpms/gdb/gdb.add35
2 files changed, 34 insertions, 6 deletions
diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add
index eef6a329d2..36862f127d 100644
--- a/contrib/crossrpms/gdb/build.add
+++ b/contrib/crossrpms/gdb/build.add
@@ -15,13 +15,16 @@
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
- --enable-sim \
+ %{build_sim} \
%if "%{gdb_version}" >= "6.7"
--with-system-readline \
%endif
%if "%{gdb_version}" >= "6.6"
--with-expat \
%endif
+%if "%{gdb_version}" >= "6.8.50"
+ --without-python \
+%endif
--with-sysroot=%{_prefix}/@tool_target@/sys-root \
--prefix=%{_prefix} --bindir=%{_bindir} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add
index 140603b16e..efd3a5e0b8 100644
--- a/contrib/crossrpms/gdb/gdb.add
+++ b/contrib/crossrpms/gdb/gdb.add
@@ -12,16 +12,41 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_host_rpmprefix}gcc
+%define build_sim --enable-sim
+%if "%{_build}" != "%{_host}"
+# psim doesn't support Cdn-X
+%if "@tool_target@" == "powerpc-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%endif
+
+%ifos mingw mingw32
+# Mingw lacks functions required by the simulator
+%if "@tool_target@" == "sparc-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%if "@tool_target@" == "h8300-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%if "%{gdb_version}" >= "6.8.50"
+%if "@tool_target@" == "m32c-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%endif
+%if "@tool_target@" == "lm32-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%if "@tool_target@" == "mipstx39-rtems@rtems_api@"
+%define build_sim --disable-sim
+%endif
+%endif
+
%if "%{gdb_version}" >= "6.6"
# suse
-%if "%{?suse}"
%if "%{?suse}" >= "10.3"
BuildRequires: libexpat-devel
%else
-BuildRequires: expat
-%endif
-%else
-# fedora/redhat/cygwin
+# Fedora/CentOS/Cygwin/MinGW
BuildRequires: %{_host_rpmprefix}expat-devel
%endif
%endif