bavier pushed a commit to branch master
in repository guix.
commit 579f5c8a58fef3a29ea3111ebae3177cd273492a
Author: Eric Bavier <[email protected]>
Date: Wed Jun 17 04:17:10 2015 -0500
gnu: hwloc: Move numactl to inputs.
* gnu/packages/mpi.scm (hwloc)[propagated-inputs]: Move numactl from here...
[inputs]: ...to here.
[arguments]: New 'refine-libnuma' phase.
---
gnu/packages/mpi.scm | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 0e1016e..9677c12 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -55,13 +55,23 @@
`(("libx11" ,libx11)
("cairo" ,cairo)
("ncurses" ,ncurses)
+ ("numactl" ,numactl)
("libpciaccess" ,libpciaccess)
("expat" ,expat)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (propagated-inputs
- ;; 'hwloc.pc' refers to libnuma, hence the propagation.
- `(("numactl" ,numactl)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ 'install 'refine-libnuma
+ ;; Give -L arguments for libraries to avoid propagation
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (numa (assoc-ref inputs "numactl")))
+ (substitute* (map (lambda (f) (string-append out "/" f))
+ '("lib/pkgconfig/hwloc.pc" "lib/libhwloc.la"))
+ (("-lnuma" lib) (string-append "-L" numa "/lib " lib)))))))))
(home-page "http://www.open-mpi.org/projects/hwloc/";)
(synopsis "Abstraction of hardware architectures")
(description
