diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-12-17 07:51:52 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-12-17 07:51:52 +0000 |
| commit | e945d6b9c9d0957d03d0c5d128f964c73e9748bd (patch) | |
| tree | 6d7386158c05b5cd9bd5955ff1a0511ec2d22c68 | |
| parent | Sync. (diff) | |
| download | rtems-e945d6b9c9d0957d03d0c5d128f964c73e9748bd.tar.bz2 | |
Backport from HEAD.
| -rw-r--r-- | contrib/crossrpms/binutils/binutils.add | 5 | ||||
| -rw-r--r-- | contrib/crossrpms/binutils/build.add | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add index 30177471b7..f682c872f1 100644 --- a/contrib/crossrpms/binutils/binutils.add +++ b/contrib/crossrpms/binutils/binutils.add @@ -11,6 +11,10 @@ License: GPL/LGPL URL: http://sources.redhat.com/binutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if "%{binutils_version}" >= "2.18" +# Bug in bfd: Doesn't build without texinfo installed +BuildRequires: texinfo >= 4.2 +%else %if %build_infos # Required for building the infos BuildRequires: /sbin/install-info @@ -20,6 +24,7 @@ BuildRequires: texinfo >= 4.2 BuildRequires: texinfo >= 4.2 %endif %endif +%endif BuildRequires: flex BuildRequires: bison %if %build_infos diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add index 193e3faa34..d9993c6c9f 100644 --- a/contrib/crossrpms/binutils/build.add +++ b/contrib/crossrpms/binutils/build.add @@ -19,7 +19,7 @@ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} - make all + make %{?_smp_mflags} all %if %build_infos make info %endif |