diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec')
-rw-r--r-- | contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec index a0af849576..d492d907bb 100644 --- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: m32r-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 11%{?dist} +Release: 12%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -99,7 +99,7 @@ BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-m32r-rtems4.10-binutils -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-33%{?dist} %if "%{gcc_version}" >= "3.4" @@ -262,6 +262,10 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32r-rtems4.10/%{gcc_version}/install-tools %endif + # Bug in gcc > 4.1.0: Installs an unused, empty directory + if test -d ${RPM_BUILD_ROOT}%{_prefix}/m32r-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/m32r-rtems4.10/include/bits + fi # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -422,7 +426,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32r-rtems4.10-binutils -# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist} +# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-33%{?dist} # License: GPL # %if %build_infos @@ -481,7 +485,7 @@ Summary: C Library (newlib) for m32r-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 32%{?dist} +Release: 33%{?dist} %description -n rtems-4.10-m32r-rtems4.10-newlib |