Changeset 41bd972 in rtems

Timestamp:

Feb 27, 2007, 4:11:37 PM (14 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

34a0e1d

Parents:

258d7d5a

Message:

Rebase binutils/gcc

Location:

contrib/crossrpms/cygwin

Files:

• binutils.am (modified) (1 diff)
• gcc-prep.add (modified) (1 diff)
• i686/Makefile.am (modified) (1 diff)
• i686/gcc-sources.add (modified) (4 diffs)

contrib/crossrpms/cygwin/binutils.am

@@ -17 +17 @@
           -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
 

contrib/crossrpms/cygwin/gcc-prep.add

@@ -1 @@
-%{__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 ..

contrib/crossrpms/cygwin/i686/Makefile.am

@@ -54 +54 @@
 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@

contrib/crossrpms/cygwin/i686/gcc-sources.add

@@ -1 @@
-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}
@@ -14 +16 @@
 %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}
@@ -20 +22 @@
 %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}
@@ -26 +28 @@
 %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
+