From: Damian Rouson <damian@sourceryinstitute.org>
To: gcc patches <gcc-patches@gcc.gnu.org>
Cc: gfortran <fortran@gcc.gnu.org>, Jerry DeLisle <jvdelisle@charter.net>
Subject: [Patch] Edit contrib/ files to download gfortran prerequisites
Date: Wed, 20 Sep 2017 20:35:00 -0000 [thread overview]
Message-ID: <etPan.59c2d116.44baeccc.18c@sourceryinstitute.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 817 bytes --]
Attached is a patch that adds the downloading of gfortran prerequisites OpenCoarrays and MPICH in the contrib/download_prerequisites script. The patch also provides a useful error message when neither wget or curl are available on the target platform. I tested this patch with several choices for the command-line options on macOS (including --md5 and --sha512) and Ubuntu Linux (including --sha512). A suggested ChangeLog entry is
* contrib/download_prerequisites: Download OpenCoarrays and MPICH.
* contrib/prerequisites.sha5: Add sha512 message digests for OpenCoarrays and MPICH.
* contrib/prerequisites.md5: Add md5 message digests for OpenCoarrays and MPICH.
OK for trunk? If so, I’ll ask Jerry to commit this. I don’t have commit rights.
Damian
[-- Attachment #2: download-opencoarrays-mpich.diff --]
[-- Type: application/octet-stream, Size: 2514 bytes --]
diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites
index ae0b5ffeb32..b1380121fe7 100755
--- a/contrib/download_prerequisites
+++ b/contrib/download_prerequisites
@@ -31,6 +31,8 @@ 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/'
@@ -38,6 +40,8 @@ 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
diff --git a/contrib/prerequisites.md5 b/contrib/prerequisites.md5
index cc71e0f4de6..36c94292c53 100644
--- a/contrib/prerequisites.md5
+++ b/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
diff --git a/contrib/prerequisites.sha512 b/contrib/prerequisites.sha512
index cf6b93b8d6b..1f496389442 100644
--- a/contrib/prerequisites.sha512
+++ b/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
next reply other threads:[~2017-09-20 20:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-20 20:35 Damian Rouson [this message]
2017-09-21 7:40 ` Richard Biener
2017-10-21 1:20 ` Damian Rouson
2017-10-21 21:17 ` Bernhard Reutner-Fischer
2017-10-23 23:14 ` Damian Rouson
2017-10-27 2:40 ` Jerry DeLisle
2017-10-23 10:55 ` Richard Biener
2017-10-23 22:06 ` Damian Rouson
2017-10-24 8:33 ` Richard Biener
2017-09-22 22:24 Jerry DeLisle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=etPan.59c2d116.44baeccc.18c@sourceryinstitute.org \
--to=damian@sourceryinstitute.org \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jvdelisle@charter.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).