[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Thu Jan 30 18:03:15 UTC 2014


Module:    rtems-crossrpms
Branch:    master
Commit:    9f510bb2177fb67a782d685da6fc743b6c04d98f
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=9f510bb2177fb67a782d685da6fc743b6c04d98f

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Fri Dec 13 07:45:01 2013 +0100

Regenerate.

---

 cygwin/i686/Makefile.in                            |   62 +++++++-------------
 cygwin/i686/i686-pc-cygwin-gcc.spec                |    2 +-
 freebsd7.4/i586/Makefile.in                        |    2 +-
 freebsd8.4/i586/Makefile.in                        |    2 +-
 freebsd8.4/x86_64/Makefile.in                      |    2 +-
 freebsd9.2/i586/Makefile.in                        |    2 +-
 freebsd9.2/x86_64/Makefile.in                      |    2 +-
 rtems4.11/arm/Makefile.in                          |    2 +-
 rtems4.11/avr/Makefile.in                          |    2 +-
 rtems4.11/bfin/Makefile.in                         |    2 +-
 rtems4.11/h8300/Makefile.in                        |    2 +-
 rtems4.11/i386/Makefile.in                         |    2 +-
 rtems4.11/lm32/Makefile.in                         |    2 +-
 rtems4.11/m32c/Makefile.in                         |    2 +-
 rtems4.11/m32r/Makefile.in                         |    2 +-
 rtems4.11/m68k/Makefile.in                         |    2 +-
 rtems4.11/microblaze/Makefile.in                   |    2 +-
 rtems4.11/mips/Makefile.in                         |    2 +-
 rtems4.11/powerpc/Makefile.in                      |    2 +-
 rtems4.11/sh/Makefile.in                           |    2 +-
 rtems4.11/sparc/Makefile.in                        |    2 +-
 rtems4.11/sparc64/Makefile.in                      |    2 +-
 rtems4.11/v850/Makefile.in                         |    2 +-
 solaris2.7/sparc/Makefile.in                       |    2 +-
 .../sparc/sparc-sun-solaris2.7-binutils.spec       |    4 +-
 solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec     |   58 ++++++++++++-------
 26 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index e38df18..c028c7a 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -79,14 +79,14 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am \
-	$(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am \
-	$(srcdir)/../ncurses.am $(srcdir)/../expat.am \
-	$(srcdir)/../readline.am $(srcdir)/../termcap.am \
-	$(srcdir)/../terminfo.am $(srcdir)/../zlib.am \
-	$(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am \
-	$(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am \
-	$(srcdir)/../binutils.am $(srcdir)/../gcc.am \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am
+	$(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am \
+	$(srcdir)/../expat.am $(srcdir)/../readline.am \
+	$(srcdir)/../termcap.am $(srcdir)/../terminfo.am \
+	$(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am \
+	$(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am \
+	$(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am \
+	$(srcdir)/../gcc.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am
 @CUSTOM_RPMPREFIX_TRUE at am__append_1 = @rpmprefix@$(TARGET)-binutils.spec
 @CUSTOM_RPMPREFIX_TRUE at am__append_2 = @rpmprefix@$(TARGET)-gcc.spec
 subdir = cygwin/i686
@@ -209,7 +209,6 @@ top_srcdir = @top_srcdir@
 TARGET = i686-pc-cygwin
 noinst_DATA = @rpmprefix@$(TARGET)-libs.spec \
 	@rpmprefix@$(TARGET)-cloog-ppl.spec \
-	@rpmprefix@$(TARGET)-w32api.spec \
 	@rpmprefix@$(TARGET)-ncurses.spec \
 	@rpmprefix@$(TARGET)-expat.spec \
 	@rpmprefix@$(TARGET)-readline.spec \
@@ -223,8 +222,7 @@ noinst_DATA = @rpmprefix@$(TARGET)-libs.spec \
 	@rpmprefix@$(TARGET)-gcc.spec
 CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
 	$(TARGET)-cloog-ppl.spec.in \
-	@rpmprefix@$(TARGET)-cloog-ppl.spec $(TARGET)-w32api.spec.in \
-	@rpmprefix@$(TARGET)-w32api.spec $(TARGET)-ncurses.spec.in \
+	@rpmprefix@$(TARGET)-cloog-ppl.spec $(TARGET)-ncurses.spec.in \
 	@rpmprefix@$(TARGET)-ncurses.spec $(TARGET)-expat.spec.in \
 	@rpmprefix@$(TARGET)-expat.spec $(TARGET)-readline.spec.in \
 	@rpmprefix@$(TARGET)-readline.spec $(TARGET)-termcap.spec.in \
@@ -241,16 +239,15 @@ CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
 	$(TARGET)-binutils.spec.in $(am__append_1) \
 	$(TARGET)-gcc.spec.in $(am__append_2)
 EXTRA_DIST = libs.add target-libs.add target-cloog-ppl.add \
-	cloog-ppl.add target-w32api.add w32api.add target-ncurses.add \
-	ncurses.add target-expat.add expat.add target-readline.add \
-	readline.add target-termcap.add termcap.add \
-	target-terminfo.add terminfo.add target-zlib.add zlib.add \
-	target-gmp.add gmp.add target-mpc.add mpc.add target-mpfr.add \
-	mpfr.add target-w32api-headers.add w32api-headers.add \
-	target-w32api-runtime.add w32api-runtime.add \
-	binutils-sources.add $(BINUTILS_SUBPACKAGES) \
-	$(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
-	$(GCC_SUBPACKAGES)
+	cloog-ppl.add target-ncurses.add ncurses.add target-expat.add \
+	expat.add target-readline.add readline.add target-termcap.add \
+	termcap.add target-terminfo.add terminfo.add target-zlib.add \
+	zlib.add target-gmp.add gmp.add target-mpc.add mpc.add \
+	target-mpfr.add mpfr.add target-w32api-headers.add \
+	w32api-headers.add target-w32api-runtime.add \
+	w32api-runtime.add binutils-sources.add \
+	$(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+	$(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES)
 SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
 MKSPEC = sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -274,11 +271,6 @@ CLOOG_PPL_RPMREL = 0.20131210.0%{?dist}
 CLOOG_PPL_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(srcdir)/cloog-ppl.add $(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-cloog-ppl.add
-W32API_VERS = 3.17-2
-W32API_RPMREL = 0.20121216.0%{?dist}
-W32API_SUBPACKAGES = $(top_srcdir)/common/common.add \
-	$(srcdir)/w32api.add $(top_srcdir)/gcc/rpm-install.add \
-	$(top_srcdir)/common/clean.add $(srcdir)/target-w32api.add
 NCURSES_VERS = 5.7-18
 NCURSES_RPMREL = 0.20131210.0%{?dist}
 NCURSES_SUBPACKAGES = $(top_srcdir)/common/common.add \
@@ -367,7 +359,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -388,7 +380,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am:
+$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -570,16 +562,6 @@ $(TARGET)-cloog-ppl.spec.in: $(CLOOG_PPL_SUBPACKAGES) Makefile.am
 @rpmprefix@$(TARGET)-cloog-ppl.spec: $(TARGET)-cloog-ppl.spec.in
 	$(MKSPEC) $(TARGET)-cloog-ppl.spec.in | $(SPECSTRIP) > $@
 
-$(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am
-	cat $(W32API_SUBPACKAGES) | sed \
-	  -e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \
-	  -e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \
-	  -e "s,%{gcc_rpmvers},%{w32api_rpmvers},g" \
-	| $(MKSPEC0) > $(TARGET)-w32api.spec.in
-
- at rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in
-	$(MKSPEC) $(TARGET)-w32api.spec.in | $(SPECSTRIP) > $@
-
 $(TARGET)-ncurses.spec.in: $(NCURSES_SUBPACKAGES) Makefile.am
 	cat $(NCURSES_SUBPACKAGES) | sed \
 	  -e "s/[@]NCURSES_VERS[@]/$(NCURSES_VERS)/g" \
@@ -713,8 +695,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/^BuildRequ.*[@]tool_target[@]-w32api-sys-root/d" \
-	  -e "s,[@]tool_target[@]-w32api-sys-root, at tool_target@-w32api," \
+	  -e "/^BuildRequ.*[@]tool_target[@]-w32api-headers-sys-root/d" \
+	  -e "s,[@]tool_target[@]-w32api-headers-sys-root, at tool_target@-w32api-headers," \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index 6611855..19fe3a6 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -252,7 +252,7 @@ BuildRequires:	i686-pc-cygwin-sys-root
 
 Requires:	i686-pc-cygwin-binutils
 Requires:	i686-pc-cygwin-sys-root
-Requires:	i686-pc-cygwin-w32api
+Requires:	i686-pc-cygwin-w32api-headers
 Requires:	i686-pc-cygwin-gcc-libgcc = %{gcc_rpmvers}-%{release}
 
 %if "%{gcc_version}" >= "4.5.0"
diff --git a/freebsd7.4/i586/Makefile.in b/freebsd7.4/i586/Makefile.in
index 58faac8..60b55f8 100644
--- a/freebsd7.4/i586/Makefile.in
+++ b/freebsd7.4/i586/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
diff --git a/freebsd8.4/i586/Makefile.in b/freebsd8.4/i586/Makefile.in
index de8ad33..af14311 100644
--- a/freebsd8.4/i586/Makefile.in
+++ b/freebsd8.4/i586/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
diff --git a/freebsd8.4/x86_64/Makefile.in b/freebsd8.4/x86_64/Makefile.in
index 1355513..72093bb 100644
--- a/freebsd8.4/x86_64/Makefile.in
+++ b/freebsd8.4/x86_64/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
diff --git a/freebsd9.2/i586/Makefile.in b/freebsd9.2/i586/Makefile.in
index ced4220..d6fdcd4 100644
--- a/freebsd9.2/i586/Makefile.in
+++ b/freebsd9.2/i586/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
diff --git a/freebsd9.2/x86_64/Makefile.in b/freebsd9.2/x86_64/Makefile.in
index a847a89..9263fa2 100644
--- a/freebsd9.2/x86_64/Makefile.in
+++ b/freebsd9.2/x86_64/Makefile.in
@@ -476,7 +476,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
diff --git a/rtems4.11/arm/Makefile.in b/rtems4.11/arm/Makefile.in
index 983c233..c7061d6 100644
--- a/rtems4.11/arm/Makefile.in
+++ b/rtems4.11/arm/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/avr/Makefile.in b/rtems4.11/avr/Makefile.in
index fb6784a..a01cef1 100644
--- a/rtems4.11/avr/Makefile.in
+++ b/rtems4.11/avr/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/bfin/Makefile.in b/rtems4.11/bfin/Makefile.in
index 0c08cf0..01c596f 100644
--- a/rtems4.11/bfin/Makefile.in
+++ b/rtems4.11/bfin/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/h8300/Makefile.in b/rtems4.11/h8300/Makefile.in
index fa95aac..e8bf8ad 100644
--- a/rtems4.11/h8300/Makefile.in
+++ b/rtems4.11/h8300/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/i386/Makefile.in b/rtems4.11/i386/Makefile.in
index 21027e4..d8e911d 100644
--- a/rtems4.11/i386/Makefile.in
+++ b/rtems4.11/i386/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/lm32/Makefile.in b/rtems4.11/lm32/Makefile.in
index 5a7a6e4..55e3de6 100644
--- a/rtems4.11/lm32/Makefile.in
+++ b/rtems4.11/lm32/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/m32c/Makefile.in b/rtems4.11/m32c/Makefile.in
index 3c839a0..1ea2949 100644
--- a/rtems4.11/m32c/Makefile.in
+++ b/rtems4.11/m32c/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/m32r/Makefile.in b/rtems4.11/m32r/Makefile.in
index dc7d28b..17bcaf0 100644
--- a/rtems4.11/m32r/Makefile.in
+++ b/rtems4.11/m32r/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/m68k/Makefile.in b/rtems4.11/m68k/Makefile.in
index 6ab426b..b378620 100644
--- a/rtems4.11/m68k/Makefile.in
+++ b/rtems4.11/m68k/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/microblaze/Makefile.in b/rtems4.11/microblaze/Makefile.in
index 3a699d6..c18ed67 100644
--- a/rtems4.11/microblaze/Makefile.in
+++ b/rtems4.11/microblaze/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/mips/Makefile.in b/rtems4.11/mips/Makefile.in
index 8ce2fde..31b27bd 100644
--- a/rtems4.11/mips/Makefile.in
+++ b/rtems4.11/mips/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/powerpc/Makefile.in b/rtems4.11/powerpc/Makefile.in
index e07dac1..82ee606 100644
--- a/rtems4.11/powerpc/Makefile.in
+++ b/rtems4.11/powerpc/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/sh/Makefile.in b/rtems4.11/sh/Makefile.in
index 4814c13..7ff93de 100644
--- a/rtems4.11/sh/Makefile.in
+++ b/rtems4.11/sh/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/sparc/Makefile.in b/rtems4.11/sparc/Makefile.in
index 42f12d3..6a23d54 100644
--- a/rtems4.11/sparc/Makefile.in
+++ b/rtems4.11/sparc/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/sparc64/Makefile.in b/rtems4.11/sparc64/Makefile.in
index 79acdab..ddb6fd3 100644
--- a/rtems4.11/sparc64/Makefile.in
+++ b/rtems4.11/sparc64/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/rtems4.11/v850/Makefile.in b/rtems4.11/v850/Makefile.in
index eab4a08..148d83b 100644
--- a/rtems4.11/v850/Makefile.in
+++ b/rtems4.11/v850/Makefile.in
@@ -483,7 +483,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \
 	  -e "/--with-sysroot/d" \
 	  -e "/[@]tool_target[@]-sys-root/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
diff --git a/solaris2.7/sparc/Makefile.in b/solaris2.7/sparc/Makefile.in
index ff3f576..6b9b132 100644
--- a/solaris2.7/sparc/Makefile.in
+++ b/solaris2.7/sparc/Makefile.in
@@ -475,7 +475,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
 	  -e "/[@]tool_target[@]-newlib/d" \
-	  -e "/[@]tool_target[@]-w32api-sys-root/d" \
+	  -e "/[@]tool_target[@]-w32api-headers-sys-root/d" \
 	  -e "/--with-newlib/d" \
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 
diff --git a/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec b/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
index 4e9f9c4..c11d330 100644
--- a/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
+++ b/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
@@ -41,8 +41,8 @@ Group:		Development/Tools
 Version:	%{binutils_rpmvers}
 Release:	0.20130308.0%{?dist}
 License:	GPL/LGPL
-URL: 		http://sources.redhat.com/binutils
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: 		http://sourceware.org/binutils
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 BuildRequires:	%{_host_rpmprefix}gcc
 
diff --git a/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec b/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
index 6464a90..45dc228 100644
--- a/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
+++ b/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
@@ -45,11 +45,14 @@ Version:        %{gcc_rpmvers}
 Release:      	0.20130308.0%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 
 %define _use_internal_dependency_generator 0
 
 BuildRequires:  %{_host_rpmprefix}gcc
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  %{_host_rpmprefix}gcc-c++
+%endif
 
 # FIXME: Disable lto for now, to avoid dependencies on libelf
 %bcond_with lto
@@ -74,12 +77,24 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %bcond_without iconv
 
 # versions of libraries, we conditionally bundle if necessary
-%global mpc_version	0.8.1
-%global mpfr_version	2.4.2
-%global gmp_version	4.3.2
+%global mpc_version	1.0.1
+%global mpfr_version	3.1.2
+%global gmp_version	5.1.2
 %global libelf_version  0.8.13
 
 # versions of libraries these distros are known to ship
+%if 0%{?fc21}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
+%if 0%{?fc20}
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?fc19}
 %global mpc_provided 1.0.1
 %global mpfr_provided 3.1.1
@@ -92,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?fc17}
-%global mpc_provided 0.9
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?el6}
 %global mpc_provided 0.8
 %global mpfr_provided 2.4.1
@@ -110,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif
 
+%if 0%{?suse13_1}
+%global mpc_provided 1.0
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.2
+%endif
+
 %if 0%{?suse12_3}
 %global mpc_provided 1.0
 %global mpfr_provided 3.1.1
@@ -122,16 +137,10 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 5.0.5
 %endif
 
-%if 0%{?suse12_1}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.0.1
-%global gmp_provided 5.0.2
-%endif
-
 %if 0%{?cygwin}
-%global mpc_provided 0.8
-%global mpfr_provided 2.4.1
-%global gmp_provided 4.3.1
+%global mpc_provided 1.0.1
+%global mpfr_provided 3.1.2
+%global gmp_provided 5.1.3
 %endif
 
 %if 0%{?mingw32}
@@ -158,6 +167,10 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %define mpfr_required		2.3.2
 %endif
 
+%if "%{gcc_version}" >= "4.8.0"
+%define mpfr_required		2.4.0
+%endif
+
 %if "%{gcc_version}" >= "4.5.0"
 %define mpc_required 		0.8
 %if %{with lto}
@@ -226,6 +239,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 
 %if "%{_build}" != "%{_host}"
 BuildRequires:  sparc-sun-solaris2.7-gcc = %{gcc_rpmvers}
+%if "%{gcc_version}" >= "4.8.0"
+BuildRequires:  sparc-sun-solaris2.7-gcc-c++ = %{gcc_rpmvers}
+%endif
 %endif
 
 # Not strictly required, but patches may introduce a need to use them.
@@ -256,7 +272,7 @@ Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_pkgvers}.tar.bz
 Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.4.7-rtems4.10-20120927.diff
 
 %if 0%{?_build_mpfr}
-Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+Source60:    http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.%{?el5:bz2}%{!?el5:xz}
 %endif
 
 %if 0%{?_build_mpc}
@@ -264,7 +280,7 @@ Source61:    http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.g
 %endif
 
 %if 0%{?_build_gmp}
-Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.%{?el5:bz2}%{!?el5:xz}
 %endif
 
 %if 0%{?_build_libelf}




More information about the vc mailing list