[rtems-crossrpms commit] Upgrade to gdb-7.5.

[Ralf Corsepius]

Module:    rtems-crossrpms
Branch:    master
Commit:    33fe6e3d28623ec27d4d9ba74b6752fbe8010958
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=33fe6e3d28623ec27d4d9ba74b6752fbe8010958

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Oct  1 12:03:45 2012 +0200

Upgrade to gdb-7.5.

---

 rtems4.11/microblaze/Makefile.am                   |    4 +-
 rtems4.11/microblaze/Makefile.in                   |    4 +-
 .../rtems-4.11-microblaze-rtems4.11-gdb.spec       |   23 +++++++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/rtems4.11/microblaze/Makefile.am b/rtems4.11/microblaze/Makefile.am
index 61c84bc..9123f5b 100644
--- a/rtems4.11/microblaze/Makefile.am
+++ b/rtems4.11/microblaze/Makefile.am
@@ -18,9 +18,9 @@ NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 7`
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
-GDB_VERS = 7.4.1
+GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 5
+GDB_RPMREL = 1
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/rtems4.11/microblaze/Makefile.in b/rtems4.11/microblaze/Makefile.in
index 3400eb8..c998c22 100644
--- a/rtems4.11/microblaze/Makefile.in
+++ b/rtems4.11/microblaze/Makefile.in
@@ -215,9 +215,9 @@ 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.1
+GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 5
+GDB_RPMREL = 1
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec
index df61221..ea200a5 100644
--- a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec
+++ b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec
@@ -45,14 +45,14 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 7.4.1
-%define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
+%define gdb_version 7.5
+%define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
 Name:		rtems-4.11-microblaze-rtems4.11-gdb
 Summary:	Gdb for target microblaze-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	5%{?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}
@@ -81,9 +81,15 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %endif
 %{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
 
+%ifos mingw mingw32
+%if "%{gdb_version}" == "7.5"
+# Mingw lacks sys/times.h, required by the microblaze simulator
+%define build_sim --disable-sim
+%endif
+%endif
 
 # suse
-%if "%{?suse}" >= "10.3"
+%if %{defined suse}
 BuildRequires: libexpat-devel
 %else
 # Fedora/CentOS/Cygwin/MinGW
@@ -98,9 +104,9 @@ 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
@@ -131,6 +137,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=microblaze-rtems4.11 \