summaryrefslogtreecommitdiffstats
path: root/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-07-23 08:52:26 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-07-23 08:52:26 +0000
commit7f43bed02b4aaf6aa89765bf64c96f12b472902a (patch)
tree8ed58d9052784fcb6df3becc95f3aed4a3ee9458 /contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec
parentBump GCC_RPMREL. (diff)
downloadrtems-7f43bed02b4aaf6aa89765bf64c96f12b472902a.tar.bz2
Regenerate.
Diffstat (limited to 'contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec')
-rw-r--r--contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec17
1 files changed, 11 insertions, 6 deletions
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