summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-05-20 17:19:47 +1000
committerChris Johns <chrisj@rtems.org>2013-05-20 17:19:47 +1000
commitd925ea3c48e637b42c722a95a63073928afce1c6 (patch)
tree7fde243ddf71c04c2cc035e78431d7a94d825676
parentFix prepend /moxie/ to path location. (diff)
downloadrtems-source-builder-d925ea3c48e637b42c722a95a63073928afce1c6.tar.bz2
Align the 4.8 and 4.5 configurations with the gcc-common.
-rw-r--r--rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg5
-rw-r--r--source-builder/config/gcc-4.5-1.cfg22
-rw-r--r--source-builder/config/gcc-4.8-1.cfg2
3 files changed, 21 insertions, 8 deletions
diff --git a/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg
index 25e99db..ce1f2b6 100644
--- a/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg
@@ -32,6 +32,11 @@
Source0: git://gcc.gnu.org/git/gcc.git?reset=hard?pull?branch=gcc-4_8-branch
#
+# Newlib is from CVS.
+#
+Source10: cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}
+
+#
# The gcc/newlib build instructions. We use 4.8 Release 1.
#
%include %{_configdir}/gcc-4.8-1.cfg
diff --git a/source-builder/config/gcc-4.5-1.cfg b/source-builder/config/gcc-4.5-1.cfg
index 638e0d1..f688fd3 100644
--- a/source-builder/config/gcc-4.5-1.cfg
+++ b/source-builder/config/gcc-4.5-1.cfg
@@ -11,21 +11,29 @@
#
# GCC core and G++
#
-Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2
-VersionContro0: git clone git://gcc.gnu.org/git/gcc.git
+%ifn %{defined Source0}
+ Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2
+%endif
#
# Newlib
#
-Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-VersionControl10: cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/src co newlib
+%ifn %{defined Source10}
+ Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
+%endif
#
# Packages GCC requires
#
-Source20: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-Source21: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%ifn %{defined Source20}
+ Source20: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
+%endif
+%ifn %{defined Source21}
+ Source21: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
+%endif
+%ifn %{defined Source22}
+ Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
+%endif
#
# GCC Common build script.
diff --git a/source-builder/config/gcc-4.8-1.cfg b/source-builder/config/gcc-4.8-1.cfg
index 4337c87..8ae6000 100644
--- a/source-builder/config/gcc-4.8-1.cfg
+++ b/source-builder/config/gcc-4.8-1.cfg
@@ -19,7 +19,7 @@
# Newlib
#
%ifn %{defined Source10}
- Source10: cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}
+ Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
%endif
#