diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-23 11:11:04 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-23 11:11:04 +0000 |
commit | a87e94df9047010367ff7467873438d43eb8c1f1 (patch) | |
tree | 950da258d72d0042ba67f8e31caf72a33449f8bd /contrib | |
parent | Bump version. (diff) | |
download | rtems-a87e94df9047010367ff7467873438d43eb8c1f1.tar.bz2 |
Sync with rtems-4.10.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/crossrpms/gdb/base-gdb.add | 4 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/build.add | 8 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/gdb.add | 19 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/prep.add | 4 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/target-gdb.add | 3 |
5 files changed, 31 insertions, 7 deletions
diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add index 12f455baf4..658f8a3861 100644 --- a/contrib/crossrpms/gdb/base-gdb.add +++ b/contrib/crossrpms/gdb/base-gdb.add @@ -7,6 +7,7 @@ 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 @rpmprefix@gdb-common @@ -28,6 +29,9 @@ fi %files -n @rpmprefix@gdb-common %defattr(-,root,root) +%sysdir %{_prefix} +%sysdir %{_prefix}/share + %sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gdb.info* diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add index 36862f127d..a60965ff99 100644 --- a/contrib/crossrpms/gdb/build.add +++ b/contrib/crossrpms/gdb/build.add @@ -16,15 +16,17 @@ --disable-win32-registry \ --disable-werror \ %{build_sim} \ -%if "%{gdb_version}" >= "6.7" - --with-system-readline \ -%endif + %{?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-sysroot=%{_prefix}/@tool_target@/sys-root \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index efd3a5e0b8..7c869f5502 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -55,10 +55,27 @@ BuildRequires: %{_host_rpmprefix}expat-devel %if "%{_build}" != "%{_host}" BuildRequires: %{_host_rpmprefix}termcap-devel %endif +%bcond_with system_readline +%else +%if 0%{?fedora} >= 12 +%bcond_with system_readline +%else +%bcond_without system_readline +%endif %endif -BuildRequires: %{_host_rpmprefix}readline-devel +%{?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} + %if %build_infos # Required for building the infos BuildRequires: /sbin/install-info diff --git a/contrib/crossrpms/gdb/prep.add b/contrib/crossrpms/gdb/prep.add index dedd1d2cbf..02b65d6813 100644 --- a/contrib/crossrpms/gdb/prep.add +++ b/contrib/crossrpms/gdb/prep.add @@ -6,7 +6,5 @@ cd gdb-%{gdb_version} %{?PATCH0:%patch0 -p1} cd .. -%if "%{gdb_version}" >= "6.7" # Force using a system-provided libreadline -rm -f gdb-%{gdb_version}/readline/configure -%endif +%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} diff --git a/contrib/crossrpms/gdb/target-gdb.add b/contrib/crossrpms/gdb/target-gdb.add index 0b5c15e74f..84cb7cf6b6 100644 --- a/contrib/crossrpms/gdb/target-gdb.add +++ b/contrib/crossrpms/gdb/target-gdb.add @@ -13,6 +13,9 @@ GNU gdb targetting @tool_target@. %files -n @rpmprefix@@tool_target@-gdb %defattr(-,root,root) +%sysdir %{_prefix} +%sysdir %{_prefix}/share + %sysdir %{_mandir} %sysdir %{_mandir}/man1 %{_mandir}/man1/@tool_target@-*.1* |