Changeset 84019c5 in rtems


Ignore:
Timestamp:
Sep 19, 2011, 10:42:33 PM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10
Children:
224463d
Parents:
a1bfb33
Message:

Sync with CVS-HEAD.

Location:
contrib/crossrpms/gdb
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/gdb/build.add

    ra1bfb33 r84019c5  
    1818    %{build_sim} \
    1919    %{?with_system_readline:--with-system-readline} \
    20 %if "%{gdb_version}" >= "6.6"
    2120    --with-expat \
    22 %endif
    23 %if "%{gdb_version}" >= "6.8.50"
    24 %if %{with python}
    25     --with-python \
    26 %else
    27     --without-python \
    28 %endif
    29 %endif
     21    %{?with_python:--with-python}%{!?with_python:--without-python} \
     22    --with-gdb-datadir=%{_datadir}/@tool_target@-gdb \
    3023    --with-sysroot=%{_prefix}/@tool_target@/sys-root \
    3124    --prefix=%{_prefix} --bindir=%{_bindir} \
  • contrib/crossrpms/gdb/gdb.add

    ra1bfb33 r84019c5  
    1313BuildRequires:  %{_host_rpmprefix}gcc
    1414
    15 %define build_sim --enable-sim
     15%global build_sim --enable-sim
     16
     17# Whether to build against system readline
     18# Default: yes
     19%bcond_without system_readline
     20
     21# Whether to build python support
     22%if "%{_build}" != "%{_host}"
     23# Can't build python Cdn-X
     24%bcond_with python
     25%else
     26%bcond_without python
     27%endif
     28%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
    1629
    1730%if "@tool_target@" == "powerpc-rtems@rtems_api@"
    1831%if "%{_build}" != "%{_host}"
    1932# psim doesn't support Cdn-X
    20 %define build_sim --disable-sim
     33%global build_sim --disable-sim
    2134%else
    22 %define build_sim --enable-sim --enable-sim-trace
     35%global build_sim --enable-sim --enable-sim-trace
    2336%endif
    2437%endif
     
    5467%endif
    5568
    56 %if "%{gdb_version}" >= "6.6"
    5769# suse
    5870%if "%{?suse}" >= "10.3"
     
    6274BuildRequires: %{_host_rpmprefix}expat-devel
    6375%endif
    64 %endif
    6576
    66 %if "%{gdb_version}" < "6.7"
    67 %if "%{_build}" != "%{_host}"
    68 BuildRequires:  %{_host_rpmprefix}termcap-devel
    69 %endif
    70 %bcond_with system_readline
    71 %else
    72 %bcond_without system_readline
    73 %endif
    7477%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
    7578BuildRequires:  %{_host_rpmprefix}ncurses-devel
    76 
    77 %if "%{gdb_version}" >= "6.8.50"
    78 %if "%{_build}" != "%{_host}"
    79 # Can't build python Cdn-X
    80 %bcond_with python
    81 %else
    82 %bcond_without python
    83 %endif
    84 %endif
    85 %{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
    8679
    8780%if %build_infos
     
    8982BuildRequires:  /sbin/install-info
    9083BuildRequires:  texinfo >= 4.2
     84Requires:       @rpmprefix@gdb-common
     85
    9186%endif
    92 
    93 %if %build_infos
    94 
    95 Requires:       @rpmprefix@gdb-common
    96 %endif
    97 
    9887@SOURCES@
    9988
  • contrib/crossrpms/gdb/install.add

    ra1bfb33 r84019c5  
    2727  rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib@tool_target@-sim.a
    2828
    29 %if "%{gdb_version}" >= "7.0"
    3029# Bug in gdb-7.0, bogusly installs linux-only files
    3130  somethinguseful=0
    32   for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
     31  for f in ${RPM_BUILD_ROOT}%{_datadir}/@tool_target@-gdb/syscalls/*.xml; do
    3332    case $f in
    3433    *linux.xml) rm -f $f;;
     
    3736  done
    3837  if test $somethinguseful -eq 0; then
    39     rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
     38    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/@tool_target@-gdb/syscalls"
    4039  fi
     40
     41%if "{gdb_version}" >= "7.3"
     42%if ! %{with python}
     43# gdb-7.3 doesn't honor --without-python correctly
     44  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/@tool_target@-gdb/python
    4145%endif
    42 
     46%endif
    4347  cd ..
    4448
  • contrib/crossrpms/gdb/target-gdb.add

    ra1bfb33 r84019c5  
    1616%sysdir %{_prefix}
    1717%sysdir %{_prefix}/share
     18%{?with_python:%{_datadir}/@tool_target@-gdb}
    1819
    1920%sysdir %{_mandir}
Note: See TracChangeset for help on using the changeset viewer.