Changeset 224463d in rtems


Ignore:
Timestamp:
Sep 19, 2011, 10:43:38 PM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10
Children:
234e2806
Parents:
84019c5
Message:

Upgrade to gdb-7.3.1

Location:
contrib/crossrpms/rtems4.10/bfin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/rtems4.10/bfin/Makefile.am

    r84019c5 r224463d  
    2020GCC_OPTS += --languages=cxx
    2121
    22 GDB_VERS = 6.5
     22GDB_VERS = 7.3.1
    2323GDB_PKGVERS = $(GDB_VERS)
    24 GDB_RPMREL = 12
     24GDB_RPMREL = 1
    2525include ../gdb.am
    2626GDB_OPTS += --disable-infos
  • contrib/crossrpms/rtems4.10/bfin/gdb-sources.add

    r84019c5 r224463d  
    1 Source0:        ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
    2 %{?_without_sources:NoSource:   0}
    3 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff
     1BuildRequires:  @rpmprefix@bfin-rtems4.10-binutils
     2BuildRequires:  texinfo
     3
     4# The bfin simulator silently tries to conditionally build an SDL based GUI,
     5# but fails to link correctly
     6# Force not building the GUI.
     7%{!?suse:BuildConflicts: SDL-devel}
     8%{?suse:BuildConflicts: libSDL-devel}
     9
     10%if "%{gdb_version}" == "7.3.1"
     11Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
     12Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.3.1-rtems4.10-20110919.diff
     13%endif
  • contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec

    r84019c5 r224463d  
    4646%endif
    4747
    48 %define gdb_version 6.5
    49 %define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)}
     48%define gdb_version 7.3.1
     49%define gdb_rpmvers %{expand:%(echo 7.3.1 | tr - _)}
    5050
    5151Name:           rtems-4.10-bfin-rtems4.10-gdb
     
    5353Group:          Development/Tools
    5454Version:        %{gdb_rpmvers}
    55 Release:        12%{?dist}
     55Release:        1%{?dist}
    5656License:        GPL/LGPL
    5757URL:            http://sources.redhat.com/gdb
     
    6060BuildRequires:  %{_host_rpmprefix}gcc
    6161
    62 %define build_sim --enable-sim
    63 
    64 
    65 %if "%{gdb_version}" >= "6.6"
     62%global build_sim --enable-sim
     63
     64# Whether to build against system readline
     65# Default: yes
     66%bcond_without system_readline
     67
     68# Whether to build python support
     69%if "%{_build}" != "%{_host}"
     70# Can't build python Cdn-X
     71%bcond_with python
     72%else
     73%bcond_without python
     74%endif
     75%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
     76
     77%global build_sim --enable-sim --enable-sim-trace
     78
    6679# suse
    6780%if "%{?suse}" >= "10.3"
     
    7184BuildRequires: %{_host_rpmprefix}expat-devel
    7285%endif
    73 %endif
    74 
    75 %if "%{gdb_version}" < "6.7"
    76 %if "%{_build}" != "%{_host}"
    77 BuildRequires:  %{_host_rpmprefix}termcap-devel
    78 %endif
    79 %bcond_with system_readline
    80 %else
    81 %bcond_without system_readline
    82 %endif
     86
    8387%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
    8488BuildRequires:  %{_host_rpmprefix}ncurses-devel
    8589
    86 %if "%{gdb_version}" >= "6.8.50"
    87 %if "%{_build}" != "%{_host}"
    88 # Can't build python Cdn-X
    89 %bcond_with python
    90 %else
    91 %bcond_without python
    92 %endif
    93 %endif
    94 %{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
    95 
    96 
    97 
    98 Source0:        ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
    99 %{?_without_sources:NoSource:   0}
    100 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff
     90BuildRequires:  rtems-4.10-bfin-rtems4.10-binutils
     91BuildRequires:  texinfo
     92
     93# The bfin simulator silently tries to conditionally build an SDL based GUI,
     94# but fails to link correctly
     95# Force not building the GUI.
     96%{!?suse:BuildConflicts: SDL-devel}
     97%{?suse:BuildConflicts: libSDL-devel}
     98
     99%if "%{gdb_version}" == "7.3.1"
     100Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
     101Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.3.1-rtems4.10-20110919.diff
     102%endif
    101103
    102104%description
     
    129131    %{build_sim} \
    130132    %{?with_system_readline:--with-system-readline} \
    131 %if "%{gdb_version}" >= "6.6"
    132133    --with-expat \
    133 %endif
    134 %if "%{gdb_version}" >= "6.8.50"
    135 %if %{with python}
    136     --with-python \
    137 %else
    138     --without-python \
    139 %endif
    140 %endif
     134    %{?with_python:--with-python}%{!?with_python:--without-python} \
     135    --with-gdb-datadir=%{_datadir}/bfin-rtems4.10-gdb \
    141136    --prefix=%{_prefix} --bindir=%{_bindir} \
    142137    --includedir=%{_includedir} --libdir=%{_libdir} \
     
    162157  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.10-sim.a
    163158
    164 %if "%{gdb_version}" >= "7.0"
    165159# Bug in gdb-7.0, bogusly installs linux-only files
    166160  somethinguseful=0
    167   for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
     161  for f in ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/syscalls/*.xml; do
    168162    case $f in
    169163    *linux.xml) rm -f $f;;
     
    172166  done
    173167  if test $somethinguseful -eq 0; then
    174     rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
     168    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/syscalls"
    175169  fi
    176 %endif
    177 
     170
     171%if "{gdb_version}" >= "7.3"
     172%if ! %{with python}
     173# gdb-7.3 doesn't honor --without-python correctly
     174  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/python
     175%endif
     176%endif
    178177  cd ..
    179178
     
    226225%dir %{_prefix}
    227226%dir %{_prefix}/share
     227%{?with_python:%{_datadir}/bfin-rtems4.10-gdb}
    228228
    229229%dir %{_mandir}
Note: See TracChangeset for help on using the changeset viewer.