Cosmetics.

This commit is contained in:
Ralf Corsepius
2005-12-22 04:05:38 +00:00
parent 381917ad7c
commit 47ae3e24c4

View File

@@ -5,8 +5,12 @@
%define gcc_target @target_alias@ %define gcc_target @target_alias@
Release: @Release@ Name: @rpmprefix@%{gcc_target}-gcc-newlib
Summary: GCC and newlib C Library for %{gcc_target}
Group: %{rpmgroup}
License: gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
Version: %{gccnewlib_version} Version: %{gccnewlib_version}
Release: @Release@
URL: http://gcc.gnu.org URL: http://gcc.gnu.org
Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_version}@gcc_suffix@ Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_version}@gcc_suffix@
@@ -21,10 +25,6 @@ Source99: brp-rtems-compress.in
BuildRequires: texinfo >= 4.2 BuildRequires: texinfo >= 4.2
BuildRequires: @rpmprefix@%{gcc_target}-binutils BuildRequires: @rpmprefix@%{gcc_target}-binutils
Name: @rpmprefix@%{gcc_target}-gcc-newlib
Summary: GCC and newlib C Library for %{gcc_target}.
Group: %{rpmgroup}
License: gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
# #
# The original sources are not included in the source RPM. # The original sources are not included in the source RPM.
@@ -121,7 +121,7 @@ This is gcc for %{gcc_target}.
BuildRequires: bison BuildRequires: bison
%endif %endif
%if "%_vendor" == "redhat" %if "%{_vendor}" == "redhat"
%if %build_gcj %if %build_gcj
BuildRequires: zlib-devel BuildRequires: zlib-devel
%endif %endif
@@ -184,9 +184,10 @@ chmod +x brp-rtems-compress
# Copy the C library into gcc's source tree # Copy the C library into gcc's source tree
ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_version} ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_version}
mkdir -p build
%build %build
mkdir -p build
cd build cd build
languages="c" languages="c"
@@ -239,10 +240,15 @@ chmod +x brp-rtems-compress
%endif %endif
make all make all
%if "%{_prefix}" != "/usr"
make info make info
%endif
cd ..
%install %install
%if "%{_prefix}" != "/usr"
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
%endif
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
cd build cd build
@@ -259,6 +265,8 @@ chmod +x brp-rtems-compress
mandir=$RPM_BUILD_ROOT%{_mandir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \
infodir=$RPM_BUILD_ROOT%{_infodir} \ infodir=$RPM_BUILD_ROOT%{_infodir} \
install install
%if "%{_prefix}" != "/usr"
cd %{gcc_target}/newlib cd %{gcc_target}/newlib
make prefix=$RPM_BUILD_ROOT%{_prefix} \ make prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} \ bindir=$RPM_BUILD_ROOT%{_bindir} \
@@ -269,6 +277,7 @@ chmod +x brp-rtems-compress
install-info install-info
# cd back to build/ # cd back to build/
cd ../.. cd ../..
%endif
# host library # host library
rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
@@ -281,9 +290,11 @@ chmod +x brp-rtems-compress
rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext} rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext}
%endif %endif
%if "%{_prefix}" != "/usr"
# We don't ship info/dir # We don't ship info/dir
rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
touch $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir
%endif
%if "%{_prefix}" == "/usr" %if "%{_prefix}" == "/usr"
# Conflict with a native GCC's infos # Conflict with a native GCC's infos