diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-18 10:34:24 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-18 10:34:24 +0000 |
| commit | 34ad1f48a6f87d3ced26cc87c6e6164bcd6a2e8d (patch) | |
| tree | a5342fd901156c80c0bdead9436962813ffffd14 /contrib | |
| parent | * rtems/score/cpu.h: Fix for inline asm in _CPU_Fatal_halt(). (diff) | |
| download | rtems-34ad1f48a6f87d3ced26cc87c6e6164bcd6a2e8d.tar.bz2 | |
Rework --with-system-readline handling.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gdb/build.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gdb/gdb.add | 9 | ||||
| -rw-r--r-- | contrib/crossrpms/gdb/prep.add | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add index fd87cc5a0c..a60965ff99 100644 --- a/contrib/crossrpms/gdb/build.add +++ b/contrib/crossrpms/gdb/build.add @@ -16,9 +16,7 @@ --disable-win32-registry \ --disable-werror \ %{build_sim} \ -%if "%{gdb_version}" >= "6.7" - --with-system-readline \ -%endif + %{?with_system_readline:--with-system-readline} \ %if "%{gdb_version}" >= "6.6" --with-expat \ %endif diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index 07aeae559a..f0271f6437 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -55,8 +55,15 @@ BuildRequires: %{_host_rpmprefix}expat-devel %if "%{_build}" != "%{_host}" BuildRequires: %{_host_rpmprefix}termcap-devel %endif +%bcond_with system_readline %endif -BuildRequires: %{_host_rpmprefix}readline-devel + +%if 0%{?fedora} >= 12 +%bcond_with system_readline +%else +%bcond_without system_readline +%endif +%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel %if "%{gdb_version}" >= "6.8.50" diff --git a/contrib/crossrpms/gdb/prep.add b/contrib/crossrpms/gdb/prep.add index dedd1d2cbf..02b65d6813 100644 --- a/contrib/crossrpms/gdb/prep.add +++ b/contrib/crossrpms/gdb/prep.add @@ -6,7 +6,5 @@ cd gdb-%{gdb_version} %{?PATCH0:%patch0 -p1} cd .. -%if "%{gdb_version}" >= "6.7" # Force using a system-provided libreadline -rm -f gdb-%{gdb_version}/readline/configure -%endif +%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} |