me
/
guix
Archived
1
0
Fork 0
Code

gnu: mpich: Remove input labels and trailing #t in phases. 

* gnu/packages/mpi.scm (mpich)[inputs]: Remove labels.
[arguments]: Remove trailing #t from phases.
Ludovic Courtès 2022-01-17 16:17:15 +01:00
parent 7bf85e63c1
commit 3f536e01c1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/mpi.scm
View File

@ -448,12 +448,12 @@ arrays) that expose a buffer interface.")
"1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb"))))
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
("hwloc" ,hwloc-2 "lib")
("slurm" ,slurm)
`(,zlib
(,hwloc-2 "lib")
,slurm
,@(if (and (not (%current-target-system))
(member (%current-system) (package-supported-systems ucx)))
`(("ucx" ,ucx))
(list ucx)
'())))
(native-inputs
(list perl which gfortran))
@ -490,8 +490,7 @@ arrays) that expose a buffer interface.")
(substitute* (find-files "." "f77tof90")
(("/usr/bin/env") (which "env")))
(substitute* (find-files "." "\\.sh$")
(("/bin/sh") (which "sh")))
#t))
(("/bin/sh") (which "sh")))))
(add-before 'configure 'fix-makefile
(lambda _
;; Remove "@hwloclib@" from 'pmpi_convenience_libs'.
@ -501,8 +500,7 @@ arrays) that expose a buffer interface.")
(("^pmpi_convenience_libs = (.*) @hwloclib@ (.*)$" _
before after)
(string-append "pmpi_convenience_libs = "
before " " after)))
#t))
before " " after)))))
(add-before 'configure 'define-gfortran-wrapper
(lambda* (#:key inputs #:allow-other-keys)
;; 'configure' checks whether the Fortran compiler