Merge pull request #9 from sourceryinstitute/download-opencoarrays-mpich

Merge master into download-opencoarrays-mpich

Author: Damian Rouson

contrib/download_prerequisites

@@ -31,13 +31,17 @@ gmp='gmp-6.1.0.tar.bz2'
 mpfr='mpfr-3.1.4.tar.bz2'
 mpc='mpc-1.0.3.tar.gz'
 isl='isl-0.18.tar.bz2'
+mpich='mpich-3.2.tar.gz'
+opencoarrays='opencoarrays-1.9.0.tar.gz'
 
 base_url='ftp://gcc.gnu.org/pub/gcc/infrastructure/'
 
 echo_archives() {
     echo "${gmp}"
     echo "${mpfr}"
     echo "${mpc}"
+    echo "${mpich}"
+    echo "${opencoarrays}"
     if [ ${graphite} -gt 0 ]; then echo "${isl}"; fi
 }
 
@@ -55,11 +59,6 @@ case $OS in
   ;;
 esac
 
-if type wget > /dev/null ; then
-  fetch='wget'
-else
-  fetch='curl -LO -u anonymous:'
-fi
 chksum_extension='sha512'
 directory='.'
 
@@ -95,6 +94,14 @@ die() {
     exit 1
 }
 
+if type wget > /dev/null ; then
+  fetch='wget'
+elif type curl > /dev/null ; then
+  fetch='curl -LO -u anonymous:'
+else
+  die "Invoking wget and curl in the 'download_prerequisites' script failed."
+fi
+
 for arg in "$@"
 do
     case "${arg}" in

contrib/prerequisites.md5

@@ -2,3 +2,5 @@
 b8a2f6b0e68bef46e53da2ac439e1cf4  mpfr-3.1.4.tar.bz2
 d6a1d5f8ddea3abd2cc3e98f58352d26  mpc-1.0.3.tar.gz
 11436d6b205e516635b666090b94ab32  isl-0.18.tar.bz2
+f414cfa77099cd1fa1a5ae4e22db508a mpich-3.2.tar.gz
+1e2b05f71d3b1a9f3cdd2ceb4b46b7a0 opencoarrays-1.9.0.tar.gz

contrib/prerequisites.sha512

@@ -2,3 +2,5 @@
 51066066ff2c12ed2198605ecf68846b0c96b548adafa5b80e0c786d0df488411a5e8973358fce7192dc977ad4e68414cf14500e3c39746de62465eb145bb819  mpfr-3.1.4.tar.bz2
 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43  mpc-1.0.3.tar.gz
 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94  isl-0.18.tar.bz2
+083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717  mpich-3.2.tar.gz
+ff081d5fbde411075a221920b6d6e2ba5698d99d4536441450cc47ba2c713fdb6d7bcf0040d1b4076059973d32892d674218b281a7fcab991282448bad0b0aad  opencoarrays-1.9.0.tar.gz