diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-03-29 03:28:22 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-03-29 03:28:22 +0000 |
commit | 49a5e79bf0647e093a34e55be2d6b944a3ca048e (patch) | |
tree | 32666621b7776b60e053cb7a7c168d13489f92c3 /contrib | |
parent | Bump GCC_RPMREL. (diff) | |
download | rtems-49a5e79bf0647e093a34e55be2d6b944a3ca048e.tar.bz2 |
Regenerate.
Diffstat (limited to 'contrib')
13 files changed, 116 insertions, 63 deletions
diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec index 149dde7989..debba96b2c 100644 --- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: arm-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-arm-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-arm-rtems4.10-binutils -Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/arm-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}/arm-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-arm-rtems4.10-binutils -# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for arm-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for arm-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec index 477613cc95..055070544b 100644 --- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: avr-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-avr-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-avr-rtems4.10-binutils -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -262,6 +262,7 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/avr-rtems4.10/%{gcc_version}/install-tools %endif + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -421,7 +422,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-avr-rtems4.10-binutils -# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -538,7 +539,7 @@ Summary: C Library (newlib) for avr-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -558,7 +559,7 @@ Newlib C Library for avr-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec index 6bad1f130d..d82507680a 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: bfin-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-bfin-rtems4.10-binutils -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/bfin-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}/bfin-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-bfin-rtems4.10-binutils -# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for bfin-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for bfin-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec index 7dff8edb30..3c145ab97b 100644 --- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: h8300-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-h8300-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-h8300-rtems4.10-binutils -Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/h8300-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}/h8300-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-h8300-rtems4.10-binutils -# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for h8300-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for h8300-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec index de6a60bc21..d463d59ca4 100644 --- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: i386-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-i386-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-i386-rtems4.10-binutils -Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i386-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}/i386-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-i386-rtems4.10-binutils -# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for i386-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for i386-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec index b94cb6496a..bab3a79dc4 100644 --- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: lm32-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-lm32-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-lm32-rtems4.10-binutils -Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/lm32-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}/lm32-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/lm32-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-lm32-rtems4.10-binutils -# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for lm32-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for lm32-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec index 1f7282df3c..1ec6615fed 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: m32c-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?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-m32c-rtems4.10-binutils Requires: rtems-4.10-m32c-rtems4.10-binutils -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -262,6 +262,7 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32c-rtems4.10/%{gcc_version}/install-tools %endif + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -421,7 +422,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32c-rtems4.10-binutils -# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -480,7 +481,7 @@ Summary: C Library (newlib) for m32c-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} %description -n rtems-4.10-m32c-rtems4.10-newlib 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 1a332342d5..a0af849576 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: 10%{?dist} +Release: 11%{?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}-31%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -262,6 +262,7 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32r-rtems4.10/%{gcc_version}/install-tools %endif + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -421,7 +422,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}-31%{?dist} +# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -480,7 +481,7 @@ Summary: C Library (newlib) for m32r-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} %description -n rtems-4.10-m32r-rtems4.10-newlib diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec index 1c6fe0941b..20ef6dd79a 100644 --- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: m68k-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-m68k-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m68k-rtems4.10-binutils -Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m68k-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}/m68k-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m68k-rtems4.10-binutils -# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for m68k-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for m68k-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec index 10b445d54b..a17012ae61 100644 --- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: mips-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-mips-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-mips-rtems4.10-binutils -Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/mips-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}/mips-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-mips-rtems4.10-binutils -# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for mips-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for mips-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec index a27aff66e4..574a2cadb9 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: powerpc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-powerpc-rtems4.10-binutils -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/powerpc-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}/powerpc-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-powerpc-rtems4.10-binutils -# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for powerpc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec index 71b3bc2f7e..480dfbf133 100644 --- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: sh-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-sh-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sh-rtems4.10-binutils -Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sh-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}/sh-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-sh-rtems4.10-binutils -# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for sh-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for sh-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec index f91352348f..898a16f8d3 100644 --- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec @@ -60,7 +60,7 @@ Summary: sparc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 10%{?dist} +Release: 11%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.10-sparc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sparc-rtems4.10-binutils -Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-31%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-32%{?dist} %if "%{gcc_version}" >= "3.4" @@ -270,6 +270,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sparc-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}/sparc-rtems4.10/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.10/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -429,7 +434,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-sparc-rtems4.10-binutils -# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-31%{?dist} +# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-32%{?dist} # License: GPL # %if %build_infos @@ -581,7 +586,7 @@ Summary: C Library (newlib) for sparc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} Requires: rtems-4.10-newlib-common @@ -601,7 +606,7 @@ Newlib C Library for sparc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 31%{?dist} +Release: 32%{?dist} License: Distributable Requires(post): /sbin/install-info |