From 28c664d1516938e40f4a7ab23b7bcf491d46cf62 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 6 Mar 2008 05:42:56 +0000
Subject: [PATCH] Upgrade to binutils-2.18. Upgrade to gcc-4.2.3. Activate
 objc.

---
 contrib/crossrpms/freebsd6.2/i586/Makefile.am  | 6 +++---
 contrib/crossrpms/freebsd6.3/i586/Makefile.am  | 5 ++---
 contrib/crossrpms/freebsd7.0/i586/Makefile.am  | 5 ++---
 contrib/crossrpms/solaris2.7/sparc/Makefile.am | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/contrib/crossrpms/freebsd6.2/i586/Makefile.am b/contrib/crossrpms/freebsd6.2/i586/Makefile.am
index 643de67d9a..2fb5f76483 100644
--- a/contrib/crossrpms/freebsd6.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.2/i586/Makefile.am
@@ -29,14 +29,14 @@ CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 
-BINUTILS_VERS = 2.17
+BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
 BINUTILS_RPMREL = @VERSION@%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
-GCC_VERS = 4.1.2
+GCC_VERS = 4.2.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@%{?dist}
+GCC_RPMREL = 1%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95,objc
diff --git a/contrib/crossrpms/freebsd6.3/i586/Makefile.am b/contrib/crossrpms/freebsd6.3/i586/Makefile.am
index 4afcccfecb..c5ae07b913 100644
--- a/contrib/crossrpms/freebsd6.3/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.3/i586/Makefile.am
@@ -37,7 +37,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@%{?dist}
+GCC_RPMREL = 1%{?dist}
 include ../gcc.am
-GCC_OPTS += --languages=c,cxx,f95
-#GCC_OPTS += --languages=c,cxx,f95,objc
+GCC_OPTS += --languages=c,cxx,f95,objc
diff --git a/contrib/crossrpms/freebsd7.0/i586/Makefile.am b/contrib/crossrpms/freebsd7.0/i586/Makefile.am
index 9bf4d0500b..5bee08860e 100644
--- a/contrib/crossrpms/freebsd7.0/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd7.0/i586/Makefile.am
@@ -37,7 +37,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@%{?dist}
+GCC_RPMREL = 1%{?dist}
 include ../gcc.am
-GCC_OPTS += --languages=c,cxx,f95
-# GCC_OPTS += --languages=cxx,f95,objc
+GCC_OPTS += --languages=cxx,f95,objc
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index ea61b052b1..f9bf64dc0b 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@%{?dist}
+GCC_RPMREL = 1%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95,objc