diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-11 17:19:06 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-11 17:19:06 -0400 |
| commit | 3c0316169b47a1c035390aae8a211dcbedc8f5f3 (patch) | |
| tree | 3c89536e1ef0c1db4339175bce7ff64d2e42f591 /gnu/packages/mpi.scm | |
| parent | ecfe88b76496c62fad4f6b6c593318378cebba22 (diff) | |
| parent | 87a841b2d4b7f8bfd661ba2d2cd2bbce7f490fbd (diff) | |
| download | patches-3c0316169b47a1c035390aae8a211dcbedc8f5f3.tar patches-3c0316169b47a1c035390aae8a211dcbedc8f5f3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/mpi.scm')
| -rw-r--r-- | gnu/packages/mpi.scm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e4c1a491c3..5dfb26ae75 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -79,6 +79,14 @@ `(#:configure-flags '("--localstatedir=/var") #:phases (modify-phases %standard-phases + (add-before 'check 'skip-linux-libnuma-test + (lambda _ + ;; Arrange to skip 'tests/linux-libnuma', which fails on some + ;; machines: <https://github.com/open-mpi/hwloc/issues/213>. + (substitute* "tests/linux-libnuma.c" + (("numa_available\\(\\)") + "-1")) + #t)) (add-after 'install 'refine-libnuma ;; Give -L arguments for libraries to avoid propagation (lambda* (#:key inputs outputs #:allow-other-keys) @@ -128,7 +136,19 @@ bind processes, and much more.") "0jf0krj1h95flmb784ifv9vnkdnajjz00p4zbhmja7vm4v67axdr")))) ;; libnuma is no longer needed. - (inputs (alist-delete "numactl" (package-inputs hwloc))))) + (inputs (alist-delete "numactl" (package-inputs hwloc))) + (arguments + (substitute-keyword-arguments (package-arguments hwloc) + ((#:phases phases) + `(modify-phases ,phases + (replace 'skip-linux-libnuma-test + (lambda _ + ;; Arrange to skip 'tests/hwloc/linux-libnuma', which fails on + ;; some machines: <https://github.com/open-mpi/hwloc/issues/213>. + (substitute* "tests/hwloc/linux-libnuma.c" + (("numa_available\\(\\)") + "-1")) + #t)))))))) (define-public openmpi (package |