From f29c64bcc622318901f37557b9e3194177796e04 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 10 Mar 2009 09:38:36 +0000 Subject: Upgrade to gdb-6.8.50 --- contrib/crossrpms/rtems4.10/m32c/Makefile.am | 6 +- contrib/crossrpms/rtems4.10/m32c/gdb-sources.add | 10 +++- .../m32c/rtems-4.10-m32c-rtems4.10-gdb.spec | 69 +++++----------------- 3 files changed, 26 insertions(+), 59 deletions(-) diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am index 6f19573f2d..1962a96af0 100644 --- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am @@ -19,11 +19,11 @@ NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --disable-infos -GDB_VERS = 6.8 +GDB_VERS = 6.8.50.20090224 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 9 +GDB_RPMREL = 3 include ../gdb.am -GDB_OPTS += +GDB_OPTS += -disable-infos CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 diff --git a/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add b/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add index 00171ece2c..9ef94d0f3a 100644 --- a/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add +++ b/contrib/crossrpms/rtems4.10/m32c/gdb-sources.add @@ -1,2 +1,8 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff +# A copy of a gdb development snapshot having been retrieved from +# ftp://sources.redhat.com/pub/gdb/snapshots/gdb-%{gdb_version}.tar.bz2 +Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2 + +# rtems-4.10 patches +# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html +# + misc small fixes to lm32-sim/gdb +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090225.diff diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec index 28550df004..2e68144f14 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec @@ -45,14 +45,14 @@ %define _host_rpmprefix %{nil} %endif -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} +%define gdb_version 6.8.50.20090224 +%define gdb_rpmvers %{expand:%(echo 6.8.50.20090224 | tr - _)} Name: rtems-4.10-m32c-rtems4.10-gdb Summary: Gdb for target m32c-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 9%{?dist} +Release: 3%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ BuildRequires: %{_host_rpmprefix}gcc %if "m32c-rtems4.10" == "h8300-rtems4.10" %define build_sim --disable-sim %endif +%if "m32c-rtems4.10" == "lm32-rtems4.10" +%define build_sim --disable-sim +%endif %if "m32c-rtems4.10" == "mipstx39-rtems4.10" %define build_sim --disable-sim %endif @@ -98,15 +101,16 @@ BuildRequires: %{_host_rpmprefix}termcap-devel BuildRequires: %{_host_rpmprefix}readline-devel BuildRequires: %{_host_rpmprefix}ncurses-devel -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -Requires: rtems-4.10-gdb-common +# A copy of a gdb development snapshot having been retrieved from +# ftp://sources.redhat.com/pub/gdb/snapshots/gdb-%{gdb_version}.tar.bz2 +Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}.tar.bz2 -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.8-rtems4.10-20090122.diff +# rtems-4.10 patches +# + lm32-sim/gdb http://sourceware.org/ml/gdb-patches/2008-12/msg00373.html +# + misc small fixes to lm32-sim/gdb +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20090225.diff %description GDB for target m32c-rtems4.10 @@ -152,7 +156,6 @@ rm -f gdb-%{gdb_version}/readline/configure --mandir=%{_mandir} --infodir=%{_infodir} make %{?_smp_mflags} all - make info cd .. %install @@ -162,13 +165,8 @@ rm -f gdb-%{gdb_version}/readline/configure cd build make DESTDIR=$RPM_BUILD_ROOT install - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* +# Conflict with a native gdb's infos + rm -rf $RPM_BUILD_ROOT%{_infodir} # We don't ship host files rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* @@ -231,40 +229,3 @@ GNU gdb targetting m32c-rtems4.10. %dir %{_bindir} %{_bindir}/m32c-rtems4.10-* -# ============================================================== -# rtems-4.10-gdb-common -# ============================================================== -%package -n rtems-4.10-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.10-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.10-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.10-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.10-gdb-common -%defattr(-,root,root) -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - -- cgit v1.2.3