Rebase binutils/gcc

4 files changed, 23 insertions, 34 deletions

diff --git a/contrib/crossrpms/cygwin/binutils.am b/contrib/crossrpms/cygwin/binutils.am
index 2772db3784..6ca8c7dba4 100644
--- a/contrib/crossrpms/cygwin/binutils.am
+++ b/contrib/crossrpms/cygwin/binutils.am
@@ -16,10 +16,11 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
+	  | $(MKSPEC0) \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
+	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
diff --git a/contrib/crossrpms/cygwin/gcc-prep.add b/contrib/crossrpms/cygwin/gcc-prep.add
index 0857a58b78..cf84f851a6 100644
--- a/contrib/crossrpms/cygwin/gcc-prep.add
+++ b/contrib/crossrpms/cygwin/gcc-prep.add
@@ -1,25 +1,4 @@
-%{__tar} xjf gcc-core-%{gcc_version}.tar.bz2
-
-%if %build_cxx
-%{__tar} xjf gcc-g++-%{gcc_version}.tar.bz2
-
-%endif
-%if %build_f95
-%{__tar} xjf gcc-fortran-%{gcc_version}.tar.bz2
-
-%endif
-%if %build_gcj
-%{__tar} xjf gcc-gcj-%{gcc_version}.tar.bz2
-
-%endif
-%if %build_gnat
-%{__tar} xjf gcc-gnat-%{gcc_version}.tar.bz2
-
-%endif
-%if %build_objc
-%{__tar} xjf gcc-objc-%{gcc_version}.tar.bz2
-
-%endif
-cd gcc-%{gcc_version}
-patch -p1 -t < ../gcc-%{gcc_pkgvers}.patch || true
+# cygwin patches can't be directly applied through rpm
+cd gcc-%{gcc_pkgvers}
+patch -p1 -t < %{SOURCE60} || true
 cd ..
diff --git a/contrib/crossrpms/cygwin/i686/Makefile.am b/contrib/crossrpms/cygwin/i686/Makefile.am
index b36e795fbd..1a08c20d4e 100644
--- a/contrib/crossrpms/cygwin/i686/Makefile.am
+++ b/contrib/crossrpms/cygwin/i686/Makefile.am
@@ -53,13 +53,15 @@ CLEANFILES += $(TARGET)-w32api.spec.in
 CLEANFILES += @rpmprefix@$(TARGET)-w32api.spec
 noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec
 
-BINUTILS_VERS = 20050610-1
-BINUTILS_PKGVERS = $(BINUTILS_VERS)
+# Cygwin's binutil's versioning is bizarre
+# Check bfd/configure for the real version number
+BINUTILS_VERS = 2.17.50
+BINUTILS_PKGVERS = 20060817-1
 BINUTILS_RPMREL = @VERSION@
 include ../binutils.am
 BINUTILS_OPTS += --disable-infos
 
-GCC_VERS = 3.4.4-2
+GCC_VERS = 3.4.4
 GCC_PKGVERS = $(GCC_VERS)
 GCC_RPMREL = @VERSION@
 include ../gcc.am
diff --git a/contrib/crossrpms/cygwin/i686/gcc-sources.add b/contrib/crossrpms/cygwin/i686/gcc-sources.add
index 7a6aba3a4e..0018b424e7 100644
--- a/contrib/crossrpms/cygwin/i686/gcc-sources.add
+++ b/contrib/crossrpms/cygwin/i686/gcc-sources.add
@@ -1,31 +1,38 @@
-Source0: 	ftp://cygwin.com/pub/cygwin/release/gcc/gcc-core/gcc-core-%{gcc_pkgvers}-src.tar.bz2
+Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
+@PATCH0@
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
-Source1: 	ftp://cygwin.com/pub/cygwin/release/gcc/gcc-g++/gcc-g++-%{gcc_pkgvers}-src.tar.bz2
+Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+@PATCH1@
 %{?_without_sources:NoSource:	1}
 
 %endif
 %if %build_f95
-Source2:	ftp://cygwin.com/pub/cygwin/release/gcc/gcc-f95/gcc-fortran-%{gcc_pkgvers}-src.tar.bz2
+Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 @PATCH2@
 %{?_without_sources:NoSource:	2}
 
 %endif
 %if %build_gcj
-Source3:	ftp://cygwin.com/pub/cygwin/release/gcc/gcc-java/gcc-java-%{gcc_pkgvers}-src.tar.bz2
+Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
 @PATCH3@
 %{?_without_sources:NoSource:	3}
 
 %endif
 %if %build_gnat
-Source4:	ftp://cygwin.com/pub/cygwin/release/gcc/gcc-ada/gcc-ada-%{gcc_pkgvers}-src.tar.bz2
+Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
 @PATCH4@
 %{?_without_sources:NoSource:	4}
 
 %endif
 %if %build_objc
-Source5:	ftp://cygwin.com/pub/cygwin/release/gcc/gcc-objc/gcc-objc-%{gcc_pkgvers}-src.tar.bz2
+Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
 @PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
+
+# Cygwin patch from
+# ftp://cygwin.com/pub/cygwin/release/gcc/gcc-core/gcc-core-3.4.4-3-src.tar.bz2
+Source60: gcc-3.4.4-3.patch
+