From 09e920b08b4aa142f87320d352d3d9df7c83930b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Aug 2011 09:17:31 +0000 Subject: Regenerate. --- .../arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec | 54 ++++++++++------------ .../arm/rtems-4.11-arm-rtems4.11-gdb.spec | 54 ++++++++++------------ .../avr/rtems-4.11-avr-rtems4.11-gdb.spec | 54 ++++++++++------------ .../h8300/rtems-4.11-h8300-rtems4.11-gdb.spec | 54 ++++++++++------------ .../i386/rtems-4.11-i386-rtems4.11-gdb.spec | 54 ++++++++++------------ .../lm32/rtems-4.11-lm32-rtems4.11-gdb.spec | 54 ++++++++++------------ .../m32c/rtems-4.11-m32c-rtems4.11-gdb.spec | 54 ++++++++++------------ .../m32r/rtems-4.11-m32r-rtems4.11-gdb.spec | 54 ++++++++++------------ .../m68k/rtems-4.11-m68k-rtems4.11-gdb.spec | 54 ++++++++++------------ .../mips/rtems-4.11-mips-rtems4.11-gdb.spec | 54 ++++++++++------------ .../rtems-4.11-mipstx39-rtems4.11-gdb.spec | 54 ++++++++++------------ .../powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec | 50 +++++++++----------- .../rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec | 54 ++++++++++------------ .../sparc/rtems-4.11-sparc-rtems4.11-gdb.spec | 54 ++++++++++------------ .../sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec | 54 ++++++++++------------ 15 files changed, 358 insertions(+), 448 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec index 3898dbeb90..ab08e564ef 100644 --- a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-arm-rtemseabi4.11-gdb Summary: Gdb for target arm-rtemseabi4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec index 9c50382dae..953158b45c 100644 --- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-arm-rtems4.11-gdb Summary: Gdb for target arm-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec index 18fb7225be..4619d076a5 100644 --- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-avr-rtems4.11-gdb Summary: Gdb for target avr-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec index 0734e2db70..d344f98c4a 100644 --- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-h8300-rtems4.11-gdb Summary: Gdb for target h8300-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,12 +61,32 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + %ifos mingw mingw32 # Mingw lacks functions required by the h8300 simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -74,28 +94,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -106,7 +108,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -142,16 +144,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec index a0f201ff79..4423c9d73e 100644 --- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-i386-rtems4.11-gdb Summary: Gdb for target i386-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec index 71c8575e4e..097ddb3cf8 100644 --- a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-lm32-rtems4.11-gdb Summary: Gdb for target lm32-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,12 +61,32 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + %ifos mingw mingw32 # Mingw lacks functions required by the lm32 simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -74,28 +94,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -106,7 +108,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -142,16 +144,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec index eff1bf4d6f..089dc61bb6 100644 --- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-m32c-rtems4.11-gdb Summary: Gdb for target m32c-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,12 +61,32 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + %ifos mingw mingw32 # Mingw lacks functions required by the m32c simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -74,28 +94,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -106,7 +108,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -142,16 +144,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec index 72823436c1..86910263ab 100644 --- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-m32r-rtems4.11-gdb Summary: Gdb for target m32r-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec index ac33a7ae14..15d0dbed25 100644 --- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-m68k-rtems4.11-gdb Summary: Gdb for target m68k-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec index 4a9c438a29..0dac85e3c3 100644 --- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-mips-rtems4.11-gdb Summary: Gdb for target mips-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec index 2759607f55..70cc3976db 100644 --- a/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-mipstx39-rtems4.11-gdb Summary: Gdb for target mipstx39-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,12 +61,32 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + %ifos mingw mingw32 # Mingw lacks functions required by the mipstx39 simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -74,28 +94,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -106,7 +108,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -142,16 +144,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec index 04ed2adbb1..fd6d25c661 100644 --- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec @@ -61,6 +61,27 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + %if "%{_build}" != "%{_host}" # psim doesn't support Cdn-X %define build_sim --disable-sim @@ -68,7 +89,6 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim --enable-sim-trace %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -76,28 +96,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -144,16 +146,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec index 094c6ff5ae..05b17ea1ca 100644 --- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-sh-rtems4.11-gdb Summary: Gdb for target sh-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec index 0256482c75..f722b2d402 100644 --- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-sparc-rtems4.11-gdb Summary: Gdb for target sparc-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,12 +61,32 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + %ifos mingw mingw32 # Mingw lacks functions required by the sparc simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -74,28 +94,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -106,7 +108,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -142,16 +144,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} diff --git a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec index d716e5e8c6..701f5a437e 100644 --- a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec +++ b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec @@ -52,7 +52,7 @@ Name: rtems-4.11-sparc64-rtems4.11-gdb Summary: Gdb for target sparc64-rtems4.11 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,8 +61,28 @@ BuildRequires: %{_host_rpmprefix}gcc %define build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%if "%{gdb_version}" >= "7.3" +# Python support is broken +%bcond_with python +%elseif "%{gdb_version}" >= "6.8.50" +%bcond_without python +%else +# python is unsupported +%bcond_with python +%endif +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,28 +90,10 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} # Required for building the infos BuildRequires: /sbin/install-info @@ -102,7 +104,7 @@ Requires: rtems-4.11-gdb-common %if "%{gdb_version}" == "7.2" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff %endif %if "%{gdb_version}" == "7.1" Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 @@ -138,16 +140,8 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} -- cgit v1.2.3