From 33378e65defd7850fe868d92dc5148e583b7a339 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Aug 2011 08:25:28 +0000 Subject: Abandon gdb < 6.8. --- contrib/crossrpms/gdb/build.add | 2 -- contrib/crossrpms/gdb/gdb.add | 14 ++++---------- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add index a60965ff99..8468d3d17f 100644 --- a/contrib/crossrpms/gdb/build.add +++ b/contrib/crossrpms/gdb/build.add @@ -17,9 +17,7 @@ --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif %if "%{gdb_version}" >= "6.8.50" %if %{with python} --with-python \ diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index 00d666554a..39b2480754 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -14,6 +14,10 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + %if "@tool_target@" == "powerpc-rtems@rtems_api@" %if "%{_build}" != "%{_host}" # psim doesn't support Cdn-X @@ -53,7 +57,6 @@ BuildRequires: %{_host_rpmprefix}gcc %endif %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -61,16 +64,7 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -- cgit v1.2.3