[PATCH 2/3] sb/gcc-common: Allow URL overrides for downloaded source

[chrisj at rtems.org]

From: Chris Johns <chrisj at rtems.org>

- This allows the URL for an older package to be defined when
  gcc no longer hosts it
---
 source-builder/config/gcc-common-1.cfg | 33 ++++++++++++++++++++------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index 0eb032b..87ccef1 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -46,18 +46,37 @@ URL: 	   http://gcc.gnu.org/
  %define rtems_gcc_version %{rtems_version}
 %endif
 
+#
+# Packages GCC URLs, can be defined for older packages
+#
+%if %{!defined cloog_url}
+ %define cloog_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined isl_url}
+ %define isl_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined mpc_url}
+ %define mpc_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined gmp_url}
+ %define gmp_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined mpfr_url}
+ %define mpfr_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+
 #
 # Packages GCC requires
 #
 %if %{defined cloog_version}
-%source set cloog https://gcc.gnu.org/pub/gcc/infrastructure/cloog-%{cloog_version}.tar.gz
+%source set cloog %{_url}/cloog-%{cloog_version}.tar.gz
 %endif
 %if %{defined isl_version}
-%source set isl https://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2
+%source set isl %{isl_url}/isl-%{isl_version}.tar.bz2
 %endif
-%source set mpc https://gcc.gnu.org/pub/gcc/infrastructure/mpc-%{mpc_version}.tar.gz
-%source set gmp https://gcc.gnu.org/pub/gcc/infrastructure/gmp-%{gmp_version}.tar.bz2
-%source set mpfr https://gcc.gnu.org/pub/gcc/infrastructure/mpfr-%{mpfr_version}.tar.bz2
+%source set mpc %{mpc_url}/mpc-%{mpc_version}.tar.gz
+%source set gmp %{gmp_url}/gmp-%{gmp_version}.tar.bz2
+%source set mpfr %{mpfr_url}/mpfr-%{mpfr_version}.tar.bz2
 
 #
 # Prepare the source code.
@@ -93,7 +112,7 @@ URL: 	   http://gcc.gnu.org/
   %source setup cloog -q -D -n cloog-%{cloog_version}
   %patch setup cloog -p1
   cd ${build_top}
-  # Build MPFR one-tree style
+  # Build CLooG one-tree style
   %{__rmfile} ${source_dir_gcc}/cloog
   %{__ln_s} $PWD/${source_dir_cloog} ${source_dir_gcc}/cloog
 %endif
@@ -104,7 +123,7 @@ URL: 	   http://gcc.gnu.org/
   %source setup isl -q -D -n isl-%{isl_version}
   %patch setup isl -p1
   cd ${build_top}
-  # Build MPFR one-tree style
+  # Build ISL one-tree style
   %{__rmfile} ${source_dir_gcc}/isl
   %{__ln_s} $PWD/${source_dir_isl} ${source_dir_gcc}/isl
 %endif
-- 
2.24.1