[rtems-crossrpms commit] Hard-code gcc versions in patches.
Ralf Corsepius
ralf at rtems.org
Fri Jun 15 03:40:52 UTC 2012
Module: rtems-crossrpms
Branch: master
Commit: ff87858a622b86f410783fe27ca4562d49c7c59f
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=ff87858a622b86f410783fe27ca4562d49c7c59f
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Jun 11 15:43:34 2012 +0200
Hard-code gcc versions in patches.
Use *tar.bz2 only on el5.
---
rtems4.11/arm/gcc-sources.add | 5 +++--
rtems4.11/avr/gcc-sources.add | 5 +++--
rtems4.11/bfin/gcc-sources.add | 5 +++--
rtems4.11/h8300/gcc-sources.add | 5 +++--
rtems4.11/i386/gcc-sources.add | 5 +++--
rtems4.11/lm32/gcc-sources.add | 5 +++--
rtems4.11/m32c/gcc-sources.add | 5 +++--
rtems4.11/m32r/gcc-sources.add | 5 +++--
rtems4.11/m68k/gcc-sources.add | 2 +-
rtems4.11/microblaze/gcc-sources.add | 2 +-
rtems4.11/mips/gcc-sources.add | 5 +++--
rtems4.11/powerpc/gcc-sources.add | 2 +-
rtems4.11/sh/gcc-sources.add | 5 +++--
rtems4.11/sparc/gcc-sources.add | 5 +++--
rtems4.11/sparc64/gcc-sources.add | 5 +++--
15 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/rtems4.11/arm/gcc-sources.add b/rtems4.11/arm/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/arm/gcc-sources.add
+++ b/rtems4.11/arm/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/avr/gcc-sources.add b/rtems4.11/avr/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/avr/gcc-sources.add
+++ b/rtems4.11/avr/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/bfin/gcc-sources.add b/rtems4.11/bfin/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/bfin/gcc-sources.add
+++ b/rtems4.11/bfin/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/h8300/gcc-sources.add b/rtems4.11/h8300/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/h8300/gcc-sources.add
+++ b/rtems4.11/h8300/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/i386/gcc-sources.add b/rtems4.11/i386/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/i386/gcc-sources.add
+++ b/rtems4.11/i386/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/lm32/gcc-sources.add b/rtems4.11/lm32/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/lm32/gcc-sources.add
+++ b/rtems4.11/lm32/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/m32c/gcc-sources.add b/rtems4.11/m32c/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/m32c/gcc-sources.add
+++ b/rtems4.11/m32c/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/m32r/gcc-sources.add b/rtems4.11/m32r/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/m32r/gcc-sources.add
+++ b/rtems4.11/m32r/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/m68k/gcc-sources.add b/rtems4.11/m68k/gcc-sources.add
index 9fe1be5..71571eb 100644
--- a/rtems4.11/m68k/gcc-sources.add
+++ b/rtems4.11/m68k/gcc-sources.add
@@ -1,7 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120419.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/microblaze/gcc-sources.add b/rtems4.11/microblaze/gcc-sources.add
index 9fe1be5..71571eb 100644
--- a/rtems4.11/microblaze/gcc-sources.add
+++ b/rtems4.11/microblaze/gcc-sources.add
@@ -1,7 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120419.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/mips/gcc-sources.add b/rtems4.11/mips/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/mips/gcc-sources.add
+++ b/rtems4.11/mips/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/powerpc/gcc-sources.add b/rtems4.11/powerpc/gcc-sources.add
index 6e5d693..0608812 100644
--- a/rtems4.11/powerpc/gcc-sources.add
+++ b/rtems4.11/powerpc/gcc-sources.add
@@ -1,7 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120403.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120403.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/sh/gcc-sources.add b/rtems4.11/sh/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/sh/gcc-sources.add
+++ b/rtems4.11/sh/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/sparc/gcc-sources.add b/rtems4.11/sparc/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/sparc/gcc-sources.add
+++ b/rtems4.11/sparc/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
diff --git a/rtems4.11/sparc64/gcc-sources.add b/rtems4.11/sparc64/gcc-sources.add
index 75fc6eb..dad432b 100644
--- a/rtems4.11/sparc64/gcc-sources.add
+++ b/rtems4.11/sparc64/gcc-sources.add
@@ -1,6 +1,7 @@
%if "%{gcc_version}" == "4.7.0"
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120322.diff
%endif
%if "%{gcc_version}" == "4.6.3"
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
More information about the vc
mailing list