From 79422633cf2d0282ed2d637d2ba237cc3f4e6a8e Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 8 Dec 2014 15:03:08 -0800
Subject: scripts: Update download locations

This change updates the download locations to default to the official
download site.

For gcc and gdb, also separate out the linaro download locations so that
if you are downloading the linaro variant, it skips trying to download
from the official gcc mirror.

This commit closes #3

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 scripts/build/companion_libs/100-gmp.sh   | 4 +++-
 scripts/build/companion_libs/110-mpfr.sh  | 5 +++--
 scripts/build/companion_libs/120-ppl.sh   | 5 +++--
 scripts/build/companion_libs/121-isl.sh   | 5 ++---
 scripts/build/companion_libs/130-cloog.sh | 3 +--
 scripts/build/companion_libs/140-mpc.sh   | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'scripts/build/companion_libs')

diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index 8674f16c..beb75ea0 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -12,7 +12,9 @@ if [ "${CT_GMP}" = "y" ]; then
 
 # Download GMP
 do_gmp_get() {
-    CT_GetFile "gmp-${CT_GMP_VERSION}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
+    CT_GetFile "gmp-${CT_GMP_VERSION}"         \
+        https://gmplib.org/download/gmp        \
+        {http,ftp,https}://ftp.gnu.org/gnu/gmp
 }
 
 # Extract GMP
diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh
index 1a917c28..2fb03aaf 100644
--- a/scripts/build/companion_libs/110-mpfr.sh
+++ b/scripts/build/companion_libs/110-mpfr.sh
@@ -12,8 +12,9 @@ if [ "${CT_MPFR}" = "y" ]; then
 
 # Download MPFR
 do_mpfr_get() {
-    CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/  \
-                                 http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/
+    CT_GetFile "mpfr-${CT_MPFR_VERSION}"            \
+        http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} \
+        {http,ftp,https}://ftp.gnu.org/gnu/mpfr
 }
 
 # Extract MPFR
diff --git a/scripts/build/companion_libs/120-ppl.sh b/scripts/build/companion_libs/120-ppl.sh
index 87d15128..c95ea56e 100644
--- a/scripts/build/companion_libs/120-ppl.sh
+++ b/scripts/build/companion_libs/120-ppl.sh
@@ -12,8 +12,9 @@ if [ "${CT_PPL}" = "y" ]; then
 
 # Download PPL
 do_ppl_get() {
-    CT_GetFile "ppl-${CT_PPL_VERSION}"  \
-        http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION}
+    CT_GetFile "ppl-${CT_PPL_VERSION}"                                          \
+        http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION} \
+        ftp://ftp.cs.unipr.it/pub/ppl/releases/${CT_PPL_VERSION}
 }
 
 # Extract PPL
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index 48b15df1..6c06ab0e 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -12,9 +12,8 @@ if [ "${CT_ISL}" = "y" ]; then
 
 # Download ISL
 do_isl_get() {
-    CT_GetFile "isl-${CT_ISL_VERSION}"  \
-        ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/ \
-        http://mirrors.kernel.org/sources.redhat.com/gcc/infrastructure
+    CT_GetFile "isl-${CT_ISL_VERSION}" \
+        http://isl.gforge.inria.fr
 }
 
 # Extract ISL
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index fe5ba136..1a3b91a5 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -24,8 +24,7 @@ if [ "${CT_CLOOG}" = "y" ]; then
 # Download CLooG
 do_cloog_get() {
     CT_GetFile "$(cloog_basename_version)"          \
-        http://www.bastoul.net/cloog/pages/download \
-        ftp://gcc.gnu.org/pub/gcc/infrastructure
+        http://www.bastoul.net/cloog/pages/download
 }
 
 # Extract CLooG
diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh
index 9ceb7e50..03071d31 100644
--- a/scripts/build/companion_libs/140-mpc.sh
+++ b/scripts/build/companion_libs/140-mpc.sh
@@ -13,7 +13,7 @@ if [ "${CT_MPC}" = "y" ]; then
 # Download MPC
 do_mpc_get() {
     CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz      \
-        http://www.multiprecision.org/mpc/download
+        {http,ftp,https}://ftp.gnu.org/gnu/mpc
 }
 
 # Extract MPC
-- 
cgit v1.2.3