diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/mpi.scm | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/mpi.scm')
| -rw-r--r-- | gnu/packages/mpi.scm | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 06a82cce95..2b73794409 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -69,6 +69,7 @@ (build-system gnu-build-system) (outputs '("out" ;'lstopo' & co., depends on Cairo, libx11, etc. "lib" ;small closure + "doc" ;400+ section 3 man pages "debug")) (inputs `(("libx11" ,libx11) @@ -114,6 +115,15 @@ (substitute* (string-append lib "/lib/pkgconfig/hwloc.pc") (("^.*prefix=.*$") "")) + #t))) + (add-after 'install 'move-man3-pages + (lambda* (#:key outputs #:allow-other-keys) + ;; Move section 3 man pages to the "doc" output. + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively (string-append out "/share/man/man3") + (string-append doc "/share/man/man3")) + (delete-file-recursively (string-append out "/share/man/man3")) #t)))))) (home-page "https://www.open-mpi.org/projects/hwloc/") (synopsis "Abstraction of hardware architectures") @@ -436,7 +446,12 @@ arrays) that expose a buffer interface.") `(#:configure-flags (list "--disable-silent-rules" ;let's see what's happening "--enable-debuginfo" - ;; "--with-device=ch4:ucx" ; --with-device=ch4:ofi segfaults in tests + + ;; Default to "ch4", as will be the case in 3.4. It also works + ;; around issues when running test suites of packages that use + ;; MPICH: <https://issues.guix.gnu.org/39588#15>. + "--with-device=ch4:ucx" ; --with-device=ch4:ofi segfaults in tests + (string-append "--with-hwloc-prefix=" (assoc-ref %build-inputs "hwloc")) |