[rtems-crossrpms commit] Bump GCC_RPMREL.
Ralf Corsepius
ralf at rtems.org
Wed Apr 4 13:11:20 UTC 2012
Module: rtems-crossrpms
Branch: master
Commit: 128c87b3182965c6c0caa8270d44d4ff5d16b745
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=128c87b3182965c6c0caa8270d44d4ff5d16b745
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Wed Apr 4 05:03:24 2012 +0200
Bump GCC_RPMREL.
---
rtems4.11/powerpc/Makefile.am | 2 +-
rtems4.11/powerpc/Makefile.in | 26 ++++++++++++++++++-
rtems4.11/powerpc/gcc-sources.add | 5 ++-
.../powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec | 19 +++++++-------
4 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/rtems4.11/powerpc/Makefile.am b/rtems4.11/powerpc/Makefile.am
index 3257df9..0c9da69 100644
--- a/rtems4.11/powerpc/Makefile.am
+++ b/rtems4.11/powerpc/Makefile.am
@@ -13,7 +13,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.7.0
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.20.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 5`
diff --git a/rtems4.11/powerpc/Makefile.in b/rtems4.11/powerpc/Makefile.in
index 9ce7579..3156ca7 100644
--- a/rtems4.11/powerpc/Makefile.in
+++ b/rtems4.11/powerpc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,6 +18,23 @@
# $Id$
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -53,6 +70,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -178,7 +200,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.7.0
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.20.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 5`
diff --git a/rtems4.11/powerpc/gcc-sources.add b/rtems4.11/powerpc/gcc-sources.add
index 75fc6eb..793cb13 100644
--- a/rtems4.11/powerpc/gcc-sources.add
+++ b/rtems4.11/powerpc/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.xz
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120403.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
index 9db4119..b4d1f44 100644
--- a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
+++ b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
@@ -58,7 +58,7 @@ Summary: powerpc-rtems4.11 gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -252,7 +252,7 @@ BuildRequires: rtems-4.11-powerpc-rtems4.11-binutils
Requires: rtems-4.11-gcc-common
Requires: rtems-4.11-powerpc-rtems4.11-binutils
Requires: rtems-4.11-powerpc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-6%{?dist}
+Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-7%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -265,8 +265,9 @@ BuildRequires: %{_host_rpmprefix}zlib-devel
%global _gcclibdir %{_prefix}/lib
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.xz
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120403.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -380,7 +381,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-6%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-7%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -665,7 +666,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.11-powerpc-rtems4.11-binutils
-# Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-6%{?dist}
+# Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-7%{?dist}
# License: GPL
# %if %build_infos
@@ -683,7 +684,7 @@ Summary: libgcc for powerpc-rtems4.11-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-6%{?dist}
+Requires: rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-7%{?dist}
License: GPL
%description -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc
@@ -868,7 +869,7 @@ Summary: C Library (newlib) for powerpc-rtems4.11
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.11-newlib-common
@@ -889,7 +890,7 @@ Newlib C Library for powerpc-rtems4.11.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
More information about the vc
mailing list