From 7bf85e63c180e5ee235a8b0596096e1df34fd5d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Jan 2022 16:03:57 +0100 Subject: gnu: mpich: Allow compilation with GCC 10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes Reported by Clément Barthelemy . * gnu/packages/mpi.scm (mpich)[arguments]: Add 'define-gfortran-wrapper' phase. --- gnu/packages/mpi.scm | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 16c42378fb..749214817d 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2014-2022 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love @@ -502,7 +502,30 @@ (define-public mpich before after) (string-append "pmpi_convenience_libs = " before " " after))) - #t))))) + #t)) + (add-before 'configure 'define-gfortran-wrapper + (lambda* (#:key inputs #:allow-other-keys) + ;; 'configure' checks whether the Fortran compiler + ;; allows argument type mismatch. Since gfortran >= 10 + ;; does not, provide a wrapper that passes + ;; '-fallow-argument-mismatch' to get the desired + ;; behavior. + (mkdir-p ".gfortran-wrapper/bin") + (call-with-output-file ".gfortran-wrapper/bin/gfortran" + (lambda (port) + (display (string-append "#!" (which "sh") "\n") + port) + (display + (string-append "exec \"" (which "gfortran") + "\" -fallow-argument-mismatch" + " \"$@\"\n") + port) + (chmod port #o755))) + + (setenv "PATH" + (string-append (getcwd) "/" + ".gfortran-wrapper/bin:" + (getenv "PATH")))))))) (home-page "https://www.mpich.org/") (synopsis "Implementation of the Message Passing Interface (MPI)") (description -- cgit v1.2.3