From 2c7f0e3d31380366f32f478b67ecec217c3f6c22 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 19 Feb 2004 14:19:15 +0000 Subject: [PATCH] 2004-02-19 Joel Sherrill * setup.def, gdb/gdb.add: gdb 6.0 RPMs built. --- scripts/ChangeLog | 4 ++++ scripts/gdb/gdb.add | 14 +++++++++++--- scripts/setup.def | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 5d4af1dc62..1ba56461ff 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2004-02-19 Joel Sherrill + + * setup.def, gdb/gdb.add: gdb 6.0 RPMs built. + 2004-02-19 Joel Sherrill * ChangeLog: Replace RTEMS user account with Joel. diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index a459e1590d..0c5d7332c6 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -12,11 +12,16 @@ Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com Version: %{gdb_version} Summary: gdb for target %{gdb_version} + +%if "%{gdb_version}" < "6.0" Source0: ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}.tar.gz +Patch0: gdb-%{gdb_version}-rtems-base-@gdb_patch_version@.diff +Patch1: gdb-%{gdb_version}-rtems-cg-@gdb_patch_version@.diff +Patch2: gdb-%{gdb_version}-rtems-rdbg-@gdb_patch_version@.diff +%else +Source0: ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}.tar.bz2 Patch0: gdb-%{gdb_version}-rtems-@gdb_patch_version@.diff -# Patch0: gdb-%{gdb_version}-rtems-base-@gdb_patch_version@.diff -# Patch1: gdb-%{gdb_version}-rtems-cg-@gdb_patch_version@.diff -# Patch2: gdb-%{gdb_version}-rtems-rdbg-@gdb_patch_version@.diff +%endif %if "%{_vendor}" == "redhat" BuildPreReq: ncurses-devel @@ -101,4 +106,7 @@ test -d build || mkdir build # gzip info files gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null +%if "%{gdb_version}" < "6.0" gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null +%endif + diff --git a/scripts/setup.def b/scripts/setup.def index 77945e15ef..0b9a831718 100644 --- a/scripts/setup.def +++ b/scripts/setup.def @@ -6,7 +6,7 @@ binutils_version=2.14 binutils_patch_version=20030911 binutils_rpm_release=3 -gdb_version=5.3 +gdb_version=6.0 gdb_patch_version=20040217 gdb_rpm_release=1 rtems_version=ss-20000726