TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
* gnu/packages/mpi.scm (mpich)[inputs]: Remove labels.
[arguments]: Remove trailing #t from phases.
This commit is contained in:
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 @@ (define-public mpich
"1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb")))) "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("zlib" ,zlib) `(,zlib
("hwloc" ,hwloc-2 "lib") (,hwloc-2 "lib")
("slurm" ,slurm) ,slurm
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(member (%current-system) (package-supported-systems ucx))) (member (%current-system) (package-supported-systems ucx)))
`(("ucx" ,ucx)) (list ucx)
'()))) '())))
(native-inputs (native-inputs
(list perl which gfortran)) (list perl which gfortran))
@ -490,8 +490,7 @@ (define-public mpich
(substitute* (find-files "." "f77tof90") (substitute* (find-files "." "f77tof90")
(("/usr/bin/env") (which "env"))) (("/usr/bin/env") (which "env")))
(substitute* (find-files "." "\\.sh$") (substitute* (find-files "." "\\.sh$")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
#t))
(add-before 'configure 'fix-makefile (add-before 'configure 'fix-makefile
(lambda _ (lambda _
;; Remove "@hwloclib@" from 'pmpi_convenience_libs'. ;; Remove "@hwloclib@" from 'pmpi_convenience_libs'.
@ -501,8 +500,7 @@ (define-public mpich
(("^pmpi_convenience_libs = (.*) @hwloclib@ (.*)$" _ (("^pmpi_convenience_libs = (.*) @hwloclib@ (.*)$" _
before after) before after)
(string-append "pmpi_convenience_libs = " (string-append "pmpi_convenience_libs = "
before " " after))) before " " after)))))
#t))
(add-before 'configure 'define-gfortran-wrapper (add-before 'configure 'define-gfortran-wrapper
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; 'configure' checks whether the Fortran compiler ;; 'configure' checks whether the Fortran compiler