[rtems-crossrpms commit] gcc-4.8.2
Ralf Corsepius
ralf at rtems.org
Sun Dec 8 18:18:00 UTC 2013
Module: rtems-crossrpms
Branch: master
Commit: a31b75592f6490589990f18e1c93793c3570ed74
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=a31b75592f6490589990f18e1c93793c3570ed74
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Sun Nov 3 17:26:32 2013 +0100
gcc-4.8.2
---
rtems4.11/arm/Makefile.am | 4 ++--
rtems4.11/arm/Makefile.in | 4 ++--
rtems4.11/arm/gcc-sources.add | 5 +++++
rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec | 23 ++++++++++++++---------
4 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/rtems4.11/arm/Makefile.am b/rtems4.11/arm/Makefile.am
index 49d8a32..ee31e53 100644
--- a/rtems4.11/arm/Makefile.am
+++ b/rtems4.11/arm/Makefile.am
@@ -10,12 +10,12 @@ include ../binutils.am
BINUTILS_OPTS +=
## gcc-4.8.0 FTBFS
-GCC_VERS = 4.8.1
+GCC_VERS = 4.8.2
GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 2
NEWLIB_VERS = 1.20.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 25`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 26`
include ../gcc.am
GCC_OPTS += --languages=cxx
diff --git a/rtems4.11/arm/Makefile.in b/rtems4.11/arm/Makefile.in
index 7d6d1b2..d20e35d 100644
--- a/rtems4.11/arm/Makefile.in
+++ b/rtems4.11/arm/Makefile.in
@@ -236,12 +236,12 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/common/clean.add \
$(top_srcdir)/binutils/target-binutils.add \
$(top_srcdir)/binutils/base-binutils.add
-GCC_VERS = 4.8.1
+GCC_VERS = 4.8.2
GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 2
NEWLIB_VERS = 1.20.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 25`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 26`
GCC_OPTS = --languages=c --newlib --languages=cxx
GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/gccnewlib.add $(top_srcdir)/gcc/prep.add \
diff --git a/rtems4.11/arm/gcc-sources.add b/rtems4.11/arm/gcc-sources.add
index 83bf533..5534073 100644
--- a/rtems4.11/arm/gcc-sources.add
+++ b/rtems4.11/arm/gcc-sources.add
@@ -1,3 +1,8 @@
+%if "%{gcc_version}" == "4.8.2"
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.1/gcc-4.8.2.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.2.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.2-rtems4.11-20131031.diff
+%endif
%if "%{gcc_version}" == "4.8.1"
# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2
Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.1.tar.%{?el5:bz2}%{!?el5:xz}
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
index f48fe9f..9d83951 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
@@ -47,9 +47,9 @@
%{?!el5:%global _with_noarch_subpackages 1}
-%define gcc_pkgvers 4.8.1
-%define gcc_version 4.8.1
-%define gcc_rpmvers %{expand:%(echo "4.8.1" | tr - _ )}
+%define gcc_pkgvers 4.8.2
+%define gcc_version 4.8.2
+%define gcc_rpmvers %{expand:%(echo "4.8.2" | tr - _ )}
%define newlib_pkgvers 1.20.0
%define newlib_version 1.20.0
@@ -253,7 +253,7 @@ BuildRequires: rtems-4.11-arm-rtems4.11-binutils
Requires: rtems-4.11-gcc-common
Requires: rtems-4.11-arm-rtems4.11-binutils
Requires: rtems-4.11-arm-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-27%{?dist}
+Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-28%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -265,6 +265,11 @@ BuildRequires: %{_host_rpmprefix}zlib-devel
%global _gcclibdir %{_prefix}/lib
+%if "%{gcc_version}" == "4.8.2"
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.1/gcc-4.8.2.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.2.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.2-rtems4.11-20131031.diff
+%endif
%if "%{gcc_version}" == "4.8.1"
# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2
Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.1.tar.%{?el5:bz2}%{!?el5:xz}
@@ -380,7 +385,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-28%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -665,7 +670,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.11-arm-rtems4.11-binutils
-# Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-27%{?dist}
+# Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-28%{?dist}
# License: GPL
# %if %build_infos
@@ -683,7 +688,7 @@ Summary: libgcc for arm-rtems4.11-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-27%{?dist}
+Requires: rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-28%{?dist}
License: GPL
Obsoletes: rtems-4.11-arm-rtemseabi4.11-gcc-libgcc < %{version}-%{release}
Provides: rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{version}-%{release}
@@ -874,7 +879,7 @@ Summary: C Library (newlib) for arm-rtems4.11
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 27%{?dist}
+Release: 28%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.11-newlib-common
@@ -897,7 +902,7 @@ Newlib C Library for arm-rtems4.11.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 27%{?dist}
+Release: 28%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
More information about the vc
mailing list