[rtems-crossrpms commit] Upgrade to gdb-7.5.
Ralf Corsepius
ralf at rtems.org
Mon Oct 1 14:19:37 UTC 2012
Module: rtems-crossrpms
Branch: master
Commit: 7ebbfabc7bc7bfa887a4fb1bb09ea78e5121efaf
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=7ebbfabc7bc7bfa887a4fb1bb09ea78e5121efaf
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Oct 1 12:03:49 2012 +0200
Upgrade to gdb-7.5.
---
rtems4.11/v850/Makefile.am | 6 +-
rtems4.11/v850/Makefile.in | 6 +-
rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec | 71 ++++++++++++++++++---
3 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/rtems4.11/v850/Makefile.am b/rtems4.11/v850/Makefile.am
index ffbe348..39803e5 100644
--- a/rtems4.11/v850/Makefile.am
+++ b/rtems4.11/v850/Makefile.am
@@ -18,11 +18,11 @@ NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 7`
include ../gcc.am
GCC_OPTS += --languages=cxx
-GDB_VERS = 7.4.91
+GDB_VERS = 7.5
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 1
include ../gdb.am
-GDB_OPTS += --disable-infos
+GDB_OPTS +=
# CPUKIT_VERS = 4.10.99.0
# CPUKIT_PKGVERS = $(CPUKIT_VERS)-YYYYMMDD-R
diff --git a/rtems4.11/v850/Makefile.in b/rtems4.11/v850/Makefile.in
index f8372ed..34122b2 100644
--- a/rtems4.11/v850/Makefile.in
+++ b/rtems4.11/v850/Makefile.in
@@ -215,10 +215,10 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/target-objc.add \
$(top_srcdir)/gcc/target-newlib.add \
$(top_srcdir)/gcc/base-newlib.add
-GDB_VERS = 7.4.91
+GDB_VERS = 7.5
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
-GDB_OPTS = --disable-infos
+GDB_RPMREL = 1
+GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
$(top_srcdir)/gdb/build.add $(top_srcdir)/gdb/install.add \
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
index c28f298..8dca6b4 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
@@ -45,14 +45,14 @@
%define _host_rpmprefix %{nil}
%endif
-%define gdb_version 7.4.91
-%define gdb_rpmvers %{expand:%(echo 7.4.91 | tr - _)}
+%define gdb_version 7.5
+%define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)}
Name: rtems-4.11-v850-rtems4.11-gdb
Summary: Gdb for target v850-rtems4.11
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,7 +63,7 @@ BuildRequires: %{_host_rpmprefix}gcc
# Whether to build against system readline
# Default: yes, except on EL5
-%if "{gdb_version}" >= "7.3.91"
+%if "%{gdb_version}" >= "7.3.91"
# gdb >= 7.3.91 requires readline6
# EL5's readline is too old
%{?el5:%bcond_with system_readline}
@@ -83,7 +83,7 @@ BuildRequires: %{_host_rpmprefix}gcc
# suse
-%if "%{?suse}" >= "10.3"
+%if %{defined suse}
BuildRequires: libexpat-devel
%else
# Fedora/CentOS/Cygwin/MinGW
@@ -93,11 +93,14 @@ BuildRequires: %{_host_rpmprefix}expat-devel
%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
BuildRequires: %{_host_rpmprefix}ncurses-devel
+# Required for building the infos
+BuildRequires: /sbin/install-info
+Requires: rtems-4.11-gdb-common
BuildRequires: texinfo >= 4.2
-%if "%{gdb_version}" == "7.4.91"
-Source0: ftp://ftp.sourceware.org/pub/gdb/snapshots/gdb-7.4.91.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.4.91-rtems4.11-20120720.diff
+%if "%{gdb_version}" == "7.5"
+Source0: ftp://ftp.sourceware.org/pub/gdb/snapshots/gdb-7.5.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.5-rtems4.11-20120928.diff
%endif
%if "%{gdb_version}" == "7.4.1"
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.4.1.tar.bz2
@@ -128,6 +131,7 @@ cd ..
CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif
CFLAGS="$RPM_OPT_FLAGS" \
+ INSTALL="install -p" \
../gdb-%{gdb_version}/configure \
--build=%_build --host=%_host \
--target=v850-rtems4.11 \
@@ -145,6 +149,7 @@ cd ..
--mandir=%{_mandir} --infodir=%{_infodir}
make %{?_smp_mflags} all
+ make info
cd ..
%install
@@ -154,8 +159,13 @@ cd ..
cd build
make DESTDIR=$RPM_BUILD_ROOT install
-# Conflict with a native gdb's infos
- rm -rf $RPM_BUILD_ROOT%{_infodir}
+ 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*
# We don't ship host files
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
@@ -246,3 +256,44 @@ GNU gdb targetting v850-rtems4.11.
%dir %{_bindir}
%{_bindir}/v850-rtems4.11-*
+# ==============================================================
+# rtems-4.11-gdb-common
+# ==============================================================
+%package -n rtems-4.11-gdb-common
+Summary: Base package for RTEMS gdbs
+Group: Development/Tools
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+%{?_with_noarch_subpackages:BuildArch: noarch}
+
+%description -n rtems-4.11-gdb-common
+
+GDB files shared by all targets.
+
+%post -n rtems-4.11-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.11-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.11-gdb-common
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_prefix}/share
+
+%dir %{_infodir}
+%ghost %{_infodir}/dir
+%{_infodir}/gdb.info*
+
+%{_infodir}/gdbint.info*
+%{_infodir}/stabs.info*
+%{_infodir}/annotate.info*
+
More information about the vc
mailing list