[rtems-crossrpms commit] Backport from trunk: Add openSUSE-12.3. Add Fedora-19. Drop Fedora-16. Drop openSUSE < 12.1.
Ralf Corsepius
ralf at rtems.org
Wed Mar 13 17:23:46 UTC 2013
Module: rtems-crossrpms
Branch: rtems-4-10-branch
Commit: af727ce518ffbdb86547fb34ba787695a753631a
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=af727ce518ffbdb86547fb34ba787695a753631a
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Tue Mar 12 15:23:07 2013 +0100
Backport from trunk: Add openSUSE-12.3. Add Fedora-19. Drop Fedora-16. Drop openSUSE < 12.1.
---
binutils/binutils.add | 6 +++---
gcc/gccnewlib.add | 30 +++++++++++++++---------------
gdb/gdb.add | 15 +++++++++++----
3 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/binutils/binutils.add b/binutils/binutils.add
index f1ca500..e0ef669 100644
--- a/binutils/binutils.add
+++ b/binutils/binutils.add
@@ -15,15 +15,15 @@ BuildRequires: %{_host_rpmprefix}gcc
%if "%{binutils_version}" >= "2.18"
# Bug in bfd: Doesn't build without texinfo installed
-BuildRequires: texinfo >= 4.2
+BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
%else
%if %build_infos
# Required for building the infos
BuildRequires: /sbin/install-info
-BuildRequires: texinfo >= 4.2
+BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
%else
%if "@tool_target@" == "i686-pc-cygwin"
-BuildRequires: texinfo >= 4.2
+BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
%endif
%endif
%endif
diff --git a/gcc/gccnewlib.add b/gcc/gccnewlib.add
index 1a33d0c..6e7f1ca 100644
--- a/gcc/gccnewlib.add
+++ b/gcc/gccnewlib.add
@@ -47,10 +47,16 @@ BuildRequires: %{_host_rpmprefix}gcc
%global libelf_version 0.8.13
# versions of libraries these distros are known to ship
+%if 0%{?fc19}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.1
+%global gmp_provided 5.1.1
+%endif
+
%if 0%{?fc18}
%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.4
+%global mpfr_provided 3.1.1
+%global gmp_provided 5.0.5
%endif
%if 0%{?fc17}
@@ -59,12 +65,6 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 5.0.2
%endif
-%if 0%{?fc16}
-%global mpc_provided 0.9
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
%if 0%{?el6}
%global mpc_provided 0.8
%global mpfr_provided 2.4.1
@@ -77,6 +77,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_3}
+%global mpc_provided 1.0
+%global mpfr_provided 3.1.1
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_2}
%global mpc_provided 0.8.2
%global mpfr_provided 3.1.0
@@ -89,12 +95,6 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 5.0.2
%endif
-%if 0%{?suse11_4}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.0
-%global gmp_provided 5.0.1
-%endif
-
%if 0%{?cygwin}
%global mpc_provided 0.8
%global mpfr_provided 2.4.1
@@ -201,7 +201,7 @@ BuildRequires: @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}
# For reasons of simplicity, always require them.
BuildRequires: flex bison
-BuildRequires: texinfo >= 4.2
+BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
BuildRequires: @rpmprefix@@tool_target at -binutils
BuildRequires: @rpmprefix@@tool_target at -sys-root
BuildRequires: @rpmprefix@@tool_target at -w32api-sys-root
diff --git a/gdb/gdb.add b/gdb/gdb.add
index 4b4bef8..05d4cc1 100644
--- a/gdb/gdb.add
+++ b/gdb/gdb.add
@@ -15,8 +15,15 @@ BuildRequires: %{_host_rpmprefix}gcc
%global build_sim --enable-sim
# Whether to build against system readline
-# Default: yes
+# Default: yes, except on EL5
+%if "%{gdb_version}" >= "7.3.91"
+# gdb >= 7.3.91 requires readline6
+# EL5's readline is too old
+%{?el5:%bcond_with system_readline}
+%{!?el5:%bcond_without system_readline}
+%else
%bcond_without system_readline
+%endif
# Whether to build python support
%if "%{_build}" != "%{_host}"
@@ -67,7 +74,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
# suse
-%if "%{?suse}" >= "10.3"
+%if %{defined suse}
BuildRequires: libexpat-devel
%else
# Fedora/CentOS/Cygwin/MinGW
@@ -80,10 +87,10 @@ BuildRequires: %{_host_rpmprefix}ncurses-devel
%if %build_infos
# Required for building the infos
BuildRequires: /sbin/install-info
-BuildRequires: texinfo >= 4.2
Requires: @rpmprefix at gdb-common
-
%endif
+BuildRequires: %{?suse:makeinfo}%{!?suse:texinfo}
+
@SOURCES@
%description
More information about the vc
mailing list