diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec')
-rw-r--r-- | contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec | 22 |
1 files changed, 7 insertions, 15 deletions
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 585b7b83a9..ecf8b9d810 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 @@ -60,7 +60,7 @@ Summary: i386-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 22%{?dist} +Release: 24%{?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}-22%{?dist} +Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-24%{?dist} %if "%{gcc_version}" >= "3.4" @@ -113,7 +113,7 @@ Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-22%{?dist} %if "%{gcc_version}" == "4.3.2" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff %endif %{?_without_sources:NoSource: 0} @@ -165,14 +165,7 @@ cd .. ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr %endif -%if "%{gcc_version}" < "4.1.0" - sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \ - gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~ -%else - sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \ - gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~ -%endif - mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c +echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -314,7 +307,6 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj @@ -437,7 +429,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}-22%{?dist} +# Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-24%{?dist} # License: GPL # %if %build_infos @@ -589,7 +581,7 @@ Summary: C Library (newlib) for i386-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 22%{?dist} +Release: 24%{?dist} Requires: rtems-4.9-newlib-common @@ -609,7 +601,7 @@ Newlib C Library for i386-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 22%{?dist} +Release: 24%{?dist} License: Distributable Requires(post): /sbin/install-info |