From 7f43bed02b4aaf6aa89765bf64c96f12b472902a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 23 Jul 2009 08:52:26 +0000 Subject: Regenerate. --- .../rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec | 17 +++++++++++------ .../powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec | 17 +++++++++++------ .../rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec | 17 +++++++++++------ 10 files changed, 110 insertions(+), 60 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec index d8dac7f89e..38f041bc91 100644 --- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: arm-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-arm-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-arm-rtems4.9-binutils -Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/arm-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-arm-rtems4.9-binutils -# Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for arm-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for arm-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec index ebc607af04..19261dc5a6 100644 --- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: avr-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-avr-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-avr-rtems4.9-binutils -Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -262,6 +262,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/avr-rtems4.9/%{gcc_version}/install-tools %endif + # Bug in gcc > 4.1.0: Installs an unused, empty directory + if test -d ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -421,7 +426,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-avr-rtems4.9-binutils -# Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -538,7 +543,7 @@ Summary: C Library (newlib) for avr-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -558,7 +563,7 @@ Newlib C Library for avr-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec index 8c31a45467..18ad185310 100644 --- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: bfin-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-bfin-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-bfin-rtems4.9-binutils -Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/bfin-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-bfin-rtems4.9-binutils -# Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for bfin-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for bfin-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec index d7c7401ea7..0cad2d14bd 100644 --- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: h8300-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-h8300-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-h8300-rtems4.9-binutils -Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/h8300-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-h8300-rtems4.9-binutils -# Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for h8300-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for h8300-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec index f635fb7b1f..631c8f2dcd 100644 --- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: i386-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-i386-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-i386-rtems4.9-binutils -Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i386-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-i386-rtems4.9-binutils -# Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for i386-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for i386-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec index 2857e282e9..feb35bddea 100644 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: m68k-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-m68k-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-m68k-rtems4.9-binutils -Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m68k-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-m68k-rtems4.9-binutils -# Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for m68k-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for m68k-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec index 779b5cec4a..6f0cdd30e4 100644 --- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: mips-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-mips-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-mips-rtems4.9-binutils -Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/mips-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-mips-rtems4.9-binutils -# Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for mips-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for mips-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec index 3da35dad5a..e16bb6b0f5 100644 --- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: powerpc-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 21%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-powerpc-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-powerpc-rtems4.9-binutils -Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-21%{?dist} +Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/powerpc-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-powerpc-rtems4.9-binutils -# Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-21%{?dist} +# Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for powerpc-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 21%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for powerpc-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 21%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec index 30e4ec0898..eb640b1bec 100644 --- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: sh-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-sh-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-sh-rtems4.9-binutils -Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sh-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-sh-rtems4.9-binutils -# Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for sh-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for sh-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec index c65439fb1c..a72ab71c79 100644 --- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec @@ -40,7 +40,7 @@ %endif %if "%{_build}" != "%{_host}" -%define _host_rpmprefix rtems-4.9-%{_host}- +%define _host_rpmprefix %{_host}- %else %define _host_rpmprefix %{nil} %endif @@ -60,7 +60,7 @@ Summary: sparc-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 20%{?dist} +Release: 22%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,7 +100,7 @@ BuildRequires: rtems-4.9-sparc-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-sparc-rtems4.9-binutils -Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-20%{?dist} +Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" >= "3.4" @@ -273,6 +273,11 @@ cd .. rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sparc-rtems4.9/%{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.9/include/bits; then + rmdir ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.9/include/bits + fi + # Collect multilib subdirectories f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -432,7 +437,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-sparc-rtems4.9-binutils -# Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-20%{?dist} +# Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-22%{?dist} # License: GPL # %if %build_infos @@ -584,7 +589,7 @@ Summary: C Library (newlib) for sparc-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} Requires: rtems-4.9-newlib-common @@ -604,7 +609,7 @@ Newlib C Library for sparc-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 20%{?dist} +Release: 22%{?dist} License: Distributable Requires(post): /sbin/install-info -- cgit v1.2.3