diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-25 05:30:01 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-25 05:30:01 +0000 |
| commit | 09a43a73436b0d4b0b5c15fd789a8e55180353d2 (patch) | |
| tree | 5e515a06df4473b60e6c1572ae23e1aeae29aa59 /contrib | |
| parent | Revert to gcc-3.4.4. (diff) | |
| download | rtems-09a43a73436b0d4b0b5c15fd789a8e55180353d2.tar.bz2 | |
Refactor patching.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/cygwin/gcc-prep.add | 7 | ||||
| -rw-r--r-- | contrib/crossrpms/cygwin/i686/gcc-sources.add | 16 |
2 files changed, 19 insertions, 4 deletions
diff --git a/contrib/crossrpms/cygwin/gcc-prep.add b/contrib/crossrpms/cygwin/gcc-prep.add index 4c68d1d57d..f428311dcf 100644 --- a/contrib/crossrpms/cygwin/gcc-prep.add +++ b/contrib/crossrpms/cygwin/gcc-prep.add @@ -1,4 +1,9 @@ # cygwin patches can't be directly applied through rpm cd gcc-%{gcc_pkgvers} -patch -p1 -t < %{SOURCE70} || true +%if "%{gcc_version}" < "4.0" +patch -p1 -t < %{PATCH70} || true +%else +patch -p2 -t < %{PATCH70} || true +%endif +%{?PATCH71:patch -p1 < %{PATCH71}} cd .. diff --git a/contrib/crossrpms/cygwin/i686/gcc-sources.add b/contrib/crossrpms/cygwin/i686/gcc-sources.add index 1b7f76f9f9..18713f22dd 100644 --- a/contrib/crossrpms/cygwin/i686/gcc-sources.add +++ b/contrib/crossrpms/cygwin/i686/gcc-sources.add @@ -32,7 +32,17 @@ Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.ta %{?_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 -Source70: gcc-3.4.4-3.patch +%if "%{gcc_version}" == "3.4.4" +# Cygwin patch extracted from +# ftp://sourceware.org/pub/cygwin/release/gcc/gcc-3.4.4-3-src.tar.bz2 +Patch70: gcc-3.4.4-3.patch +Patch71: cygwin-gcc-3.4.4-3.diff +%endif +%if "%{gcc_version}" == "4.3.4" +# Cygwin patch extracted from +# ftp://sourceware.org/pub/cygwin/release/gcc4/gcc4-4.3.4-3-src.tar.bz2 +Patch70: gcc4-4.3.4-3.src.patch + +Patch71: cygwin-gcc4-4.3.4-3.diff +%endif |