public inbox for fortran@gcc.gnu.org
 help / color / mirror / Atom feed
* [Patch] Edit contrib/ files to download gfortran prerequisites
@ 2017-09-20 20:35 Damian Rouson
  2017-09-21  7:40 ` Richard Biener
  0 siblings, 1 reply; 10+ messages in thread
From: Damian Rouson @ 2017-09-20 20:35 UTC (permalink / raw)
  To: gcc patches; +Cc: gfortran, Jerry DeLisle

[-- 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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [Patch] Edit contrib/ files to download gfortran prerequisites
@ 2017-09-22 22:24 Jerry DeLisle
  0 siblings, 0 replies; 10+ messages in thread
From: Jerry DeLisle @ 2017-09-22 22:24 UTC (permalink / raw)
  To: Richard Biener; +Cc: Damian Rouson, Zaak Beekman, gcc patches, gfortran

On Thu, 21 Sep 2017 09:40:49Richard Biener wrote:
> On Wed, Sep 20, 2017 at 10:35 PM, Damian Rouson
> <damian@sourceryinstitute.org> wrote:
> >> 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.

> Can you make this optional similar to graphite/isl?  Also I see no support in
> the toplevel build machinery to build/install the libs as part of GCC
> so how does that work in the end?

In the end gcc needs to know what to do and just do it just like mpfr and
libquadmath.

I started looking at Makefile.def and I am guessing this is where the changes
need to be made to enable gcc machinery to actually build the two packages.  I
am not knowledgeable enough to figure this out and I recently got a new job so
now am very time constrained as far as reverse engineering what is going on.

I did manage to add Gnu Build System autotools features to OpenCoarrays so we
could be closer to integrating this in. (./configure && make vs cmake)

We definitely need some guidance from someone regarding the changes required for
the top level gcc items.

Also we are getting some libtool related build failures with the OpenCoarrays on
Mac and some other platforms where we know gcc builds fine, so I suspect we need
to build a libtool script or something to ensure that it works everywhere. It
works fine on Fedora which is what I use (naturally).

So if anyone would step up to the plate and advise on the toplevel machinery it
would be greatly appreciated.

Regards,

Jerry

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-10-27  2:27 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-20 20:35 [Patch] Edit contrib/ files to download gfortran prerequisites Damian Rouson
2017-09-21  7:40 ` Richard Biener
2017-10-21  0:26   ` Damian Rouson
2017-10-21 18:17     ` Bernhard Reutner-Fischer
2017-10-23 23:09       ` Damian Rouson
2017-10-27  2:27       ` Jerry DeLisle
2017-10-23 10:54     ` Richard Biener
2017-10-23 22:02       ` Damian Rouson
2017-10-24  8:26         ` Richard Biener
2017-09-22 22:24 Jerry DeLisle

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).