From 60ac65d8407cd87044d02e1a6a63134c0fbe967f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 29 Oct 2002 16:53:14 +0000 Subject: 2002-10-29 Ralf Corsepius * gcc3newlib/gccnewlib.add: Remove %{target} != %{build} comment (RH-8.0/rpm-4.1 bogusly expands the macros and chokes.) * binutils/binutils.add: Remove %{target} != %{build} comment (RH-8.0/rpm-4.1 bogusly expands the macros and chokes.). Comment out CONFIGURE_ARGS (RH-8.0/rpm-4.1 is broken wrt. _build_os and _target_os) * gcc3newlib/base-gcc.add: Add gccint*infos. * gcc3newlib/base-gcj.add: Add gcj*infos. Mark manpages as %doc and pickup the gzipped versions. --- scripts/ChangeLog | 12 ++++++++++++ scripts/binutils/binutils.add | 7 +++---- scripts/gcc3newlib/base-gcc.add | 1 + scripts/gcc3newlib/base-gcj.add | 17 ++++++++++------- scripts/gcc3newlib/gccnewlib.add | 2 +- 5 files changed, 27 insertions(+), 12 deletions(-) (limited to 'scripts') diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 95f6c2593a..e4b75f429d 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,15 @@ +2002-10-29 Ralf Corsepius + + * gcc3newlib/gccnewlib.add: Remove %{target} != %{build} comment + (RH-8.0/rpm-4.1 bogusly expands the macros and chokes.) + * binutils/binutils.add: Remove %{target} != %{build} comment + (RH-8.0/rpm-4.1 bogusly expands the macros and chokes.). + Comment out CONFIGURE_ARGS (RH-8.0/rpm-4.1 is broken wrt. _build_os + and _target_os) + * gcc3newlib/base-gcc.add: Add gccint*infos. + * gcc3newlib/base-gcj.add: Add gcj*infos. + Mark manpages as %doc and pickup the gzipped versions. + 2002-10-25 Ralf Corsepius * autotools/automake-rtems.spec.in: Fix my address. Set up PATH diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 25f9666de6..bdda16e595 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -51,10 +51,9 @@ This is binutils sources with patches for RTEMS. test -d build || mkdir build %build -# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it. -%if "%{_target_os}" != "%{_build_os}" - CONFIGURE_ARGS="--build=%{_build} --host=%{_target}" -%endif +#%if "%{_target_os}" != "%{_build_os}" +# CONFIGURE_ARGS="--build=%{_build} --host=%{_target}" +#%endif cd build ../binutils-@binutils_version@/configure ${CONFIGURE_ARGS} --target=@target_alias@ \ diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add index 21341bb0a9..6c079d4da7 100644 --- a/scripts/gcc3newlib/base-gcc.add +++ b/scripts/gcc3newlib/base-gcc.add @@ -19,6 +19,7 @@ This is the files for gcc and newlib that are shared by all targets. %doc %{_prefix}/info/gcc.info*.gz %doc %{_prefix}/info/libc.info*.gz %doc %{_prefix}/info/libm.info*.gz +%doc %{_prefix}/info/gccint.info*.gz %dir %{_prefix}/man %dir %{_prefix}/man/man1 diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add index ac5d4c26fd..3c9b67a5bb 100644 --- a/scripts/gcc3newlib/base-gcj.add +++ b/scripts/gcc3newlib/base-gcj.add @@ -18,13 +18,16 @@ This is the files for gcc/java (gcj) that are shared by all targets. %{_prefix}/bin/jar@exe_ext@ %{_prefix}/bin/grepjar@exe_ext@ +%dir %{_prefix}/info +%doc %{_prefix}/info/gcj.info*.gz + %dir %{_prefix}/man/man1 -%{_prefix}/man/man1/gcjh.1 -%{_prefix}/man/man1/jv-scan.1 -%{_prefix}/man/man1/jcf-dump.1 -%{_prefix}/man/man1/gij.1 -%{_prefix}/man/man1/jv-convert.1 -%{_prefix}/man/man1/rmic.1 -%{_prefix}/man/man1/rmiregistry.1 +%doc %{_prefix}/man/man1/gcjh.1* +%doc %{_prefix}/man/man1/jv-scan.1* +%doc %{_prefix}/man/man1/jcf-dump.1* +%doc %{_prefix}/man/man1/gij.1* +%doc %{_prefix}/man/man1/jv-convert.1* +%doc %{_prefix}/man/man1/rmic.1* +%doc %{_prefix}/man/man1/rmiregistry.1* %endif diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add index ee33298586..c41956e88f 100644 --- a/scripts/gcc3newlib/gccnewlib.add +++ b/scripts/gcc3newlib/gccnewlib.add @@ -130,7 +130,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. %build cd build -# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it. +# HACK: This doesn't work # %if "%{_target_os}" != "%{_build_os}" # CONFIGURE_ARGS="--build=%{_build} --host=%{_target}" # %endif -- cgit v1.2.3