diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-08-22 10:31:12 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-08-22 10:31:12 +0000 |
| commit | 5c47f47f1a85b8fd60ec4703a1776c671eb8f3bc (patch) | |
| tree | 0d3ff56b8e9178ab57a79089791214897009083c /scripts | |
| parent | 2003-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-5c47f47f1a85b8fd60ec4703a1776c671eb8f3bc.tar.bz2 | |
2003-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/binutils.add: Preps for 2.14.
Use %{binutils_version} instead of @binutils_version@.
* binutils/base_binutils.add: Preps for 2.14.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | scripts/binutils/base-binutils.add | 9 | ||||
| -rw-r--r-- | scripts/binutils/binutils.add | 11 |
3 files changed, 19 insertions, 7 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index ff954e2c58..4b999a8de1 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2003-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * binutils/binutils.add: Preps for 2.14. + Use %{binutils_version} instead of @binutils_version@. + * binutils/base_binutils.add: Preps for 2.14. + 2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Use rtems-bugs@rtems.com as bug report email address. diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add index c889340cff..c354e8219d 100644 --- a/scripts/binutils/base-binutils.add +++ b/scripts/binutils/base-binutils.add @@ -38,13 +38,16 @@ This is the base for binutils regardless of target CPU. %dir %{_prefix}/info %doc %{_prefix}/info/dir %doc %{_prefix}/info/as.info.gz -%doc %{_prefix}/info/as.info-*.gz %doc %{_prefix}/info/bfd.info.gz -%doc %{_prefix}/info/bfd.info-?.gz %doc %{_prefix}/info/binutils.info.gz -%doc %{_prefix}/info/binutils.info-?.gz %doc %{_prefix}/info/ld.info.gz +%if "%{binutils_version}" < "2.14" +# binutils >= 2.14 ships monolytic infos. +%doc %{_prefix}/info/as.info-*.gz +%doc %{_prefix}/info/bfd.info-?.gz +%doc %{_prefix}/info/binutils.info-?.gz %doc %{_prefix}/info/ld.info-?.gz +%endif # deleted as of 2.13 # %doc %{_prefix}/info/gasp.info.gz %doc %{_prefix}/info/standards.info.gz diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index f1c070faa7..1ff0abc247 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -1,3 +1,6 @@ + +%define binutils_version @binutils_version@ + Name: @target_alias@-binutils-collection Summary: binutils for target @target_alias@ Group: rtems @@ -10,8 +13,8 @@ Prefix: %{_prefix} BuildPreReq: /sbin/install-info BuildPreReq: texinfo >= 4.2 -Version: @binutils_version@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-@binutils_version@.tar.bz2 +Version: %{binutils_version} +Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_version}.tar.bz2 @PATCH1@ # @@ -41,7 +44,7 @@ This is binutils sources with patches for RTEMS. %build cd build - ../binutils-@binutils_version@/configure \ + ../binutils-%{binutils_version}/configure \ --build=%_build --host=%_host \ --target=@target_alias@ \ --verbose --prefix=%{_prefix} --disable-nls @@ -56,7 +59,7 @@ This is binutils sources with patches for RTEMS. make prefix=$RPM_BUILD_ROOT%{_prefix} install-info # A bug in binutils: binutils does not install share/locale # however it uses it - ../binutils-@binutils_version@/mkinstalldirs \ + ../binutils-%{binutils_version}/mkinstalldirs \ $RPM_BUILD_ROOT%{_prefix}/share/locale rm -f $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-c++filt%{_exeext} |