[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/14] gnu: hwloc: Move numactl to inputs.
From: |
ericbavier |
Subject: |
[PATCH 02/14] gnu: hwloc: Move numactl to inputs. |
Date: |
Sat, 27 Jun 2015 22:45:39 -0500 |
From: Eric Bavier <address@hidden>
* 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 file 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
--
2.2.1
- [PATCH 00/14] Add deal.II and some dependencies., ericbavier, 2015/06/27
- [PATCH 01/14] gnu: hwloc: Upgrade to 1.10.1., ericbavier, 2015/06/27
- [PATCH 02/14] gnu: hwloc: Move numactl to inputs.,
ericbavier <=
- [PATCH 03/14] gnu: openmpi: Upgrade to 1.8.5., ericbavier, 2015/06/27
- [PATCH 04/14] gnu: Update scotch to 6.0.4., ericbavier, 2015/06/27
- [PATCH 07/14] gnu: Add ScaLAPACK., ericbavier, 2015/06/27
- [PATCH 05/14] gnu: scotch, pt-scotch: Use modify-phases., ericbavier, 2015/06/27
- [PATCH 06/14] gnu: scotch, pt-scotch: Build esmumps libraries., ericbavier, 2015/06/27