From 3db7a92c9baa332f297c1856fc83cd7a2649792a Mon Sep 17 00:00:00 2001
From: bgermann <bgermann@users.noreply.github.com>
Date: Thu, 29 Mar 2018 22:56:25 +0200
Subject: [PATCH] Replace gcc's download_prerequisites with Ubuntu packages

Travis CI has problems downloading from GNU's FTP servers,
so use the appropriate Ubuntu packages to not cause timeouts.
---
 docker/dragonfly.sh | 5 ++++-
 docker/freebsd.sh   | 8 ++++----
 docker/netbsd.sh    | 5 ++++-
 docker/solaris.sh   | 8 ++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docker/dragonfly.sh b/docker/dragonfly.sh
index 8a4914728..acabeb284 100644
--- a/docker/dragonfly.sh
+++ b/docker/dragonfly.sh
@@ -12,6 +12,10 @@ main() {
         ca-certificates
         curl
         g++
+        libgmp-dev
+        libisl-dev
+        libmpc-dev
+        libmpfr-dev
         make
         patch
         wget
@@ -40,7 +44,6 @@ main() {
     pushd $td
 
     cd gcc
-    ./contrib/download_prerequisites
     patch -p0 <<'EOF'
 --- libatomic/configure.tgt.orig	2015-07-09 16:08:55 UTC
 +++ libatomic/configure.tgt
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
index e78ca86b0..e70c112e5 100644
--- a/docker/freebsd.sh
+++ b/docker/freebsd.sh
@@ -12,6 +12,10 @@ main() {
         ca-certificates
         curl
         g++
+        libgmp-dev
+        libisl-dev
+        libmpc-dev
+        libmpfr-dev
         make
         wget
         xz-utils
@@ -38,10 +42,6 @@ main() {
 
     pushd $td
 
-    cd gcc
-    ./contrib/download_prerequisites
-    cd ..
-
     local bsd_arch=
     case $arch in
         x86_64)
diff --git a/docker/netbsd.sh b/docker/netbsd.sh
index f79cd57ea..7bf708958 100644
--- a/docker/netbsd.sh
+++ b/docker/netbsd.sh
@@ -10,6 +10,10 @@ main() {
         ca-certificates
         curl
         g++
+        libgmp-dev
+        libisl-dev
+        libmpc-dev
+        libmpfr-dev
         make
         patch
         wget
@@ -38,7 +42,6 @@ main() {
     pushd $td
 
     cd gcc
-    ./contrib/download_prerequisites
     local patches=(
         ftp://ftp.netbsd.org/pub/pkgsrc/pkgsrc-2016Q4/pkgsrc/lang/gcc5/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
         ftp://ftp.netbsd.org/pub/pkgsrc/pkgsrc-2016Q4/pkgsrc/lang/gcc5/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc
diff --git a/docker/solaris.sh b/docker/solaris.sh
index 75705d804..baf4e52bf 100644
--- a/docker/solaris.sh
+++ b/docker/solaris.sh
@@ -12,6 +12,10 @@ main() {
         ca-certificates
         curl
         g++
+        libgmp-dev
+        libisl-dev
+        libmpc-dev
+        libmpfr-dev
         make
         software-properties-common
         wget
@@ -39,10 +43,6 @@ main() {
 
     pushd $td
 
-    cd gcc
-    ./contrib/download_prerequisites
-    cd ..
-
     local apt_arch=
     local lib_arch=
     case $arch in