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.
This commit is contained in:
Eric Bavier 2015-06-17 04:17:10 -05:00
parent ce7d9c989d
commit 579f5c8a58
1 changed files with 13 additions and 3 deletions

View File

@ -55,13 +55,23 @@
`(("libx11" ,libx11) `(("libx11" ,libx11)
("cairo" ,cairo) ("cairo" ,cairo)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("numactl" ,numactl)
("libpciaccess" ,libpciaccess) ("libpciaccess" ,libpciaccess)
("expat" ,expat))) ("expat" ,expat)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(propagated-inputs (arguments
;; 'hwloc.pc' refers to libnuma, hence the propagation. `(#:phases
`(("numactl" ,numactl))) (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/") (home-page "http://www.open-mpi.org/projects/hwloc/")
(synopsis "Abstraction of hardware architectures") (synopsis "Abstraction of hardware architectures")
(description (description