From: ericbavier@openmailbox.org
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH 02/14] gnu: hwloc: Move numactl to inputs.
Date: Sat, 27 Jun 2015 22:45:39 -0500 [thread overview]
Message-ID: <1435463151-32099-3-git-send-email-ericbavier@openmailbox.org> (raw)
In-Reply-To: <1435463151-32099-1-git-send-email-ericbavier@openmailbox.org>
From: Eric Bavier <bavier@member.fsf.org>
* 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
next prev parent reply other threads:[~2015-06-28 3:44 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-28 3:45 [PATCH 00/14] Add deal.II and some dependencies ericbavier
2015-06-28 3:45 ` [PATCH 01/14] gnu: hwloc: Upgrade to 1.10.1 ericbavier
2015-06-28 9:08 ` Ludovic Courtès
2015-06-28 3:45 ` ericbavier [this message]
2015-06-28 9:09 ` [PATCH 02/14] gnu: hwloc: Move numactl to inputs Ludovic Courtès
2015-06-28 3:45 ` [PATCH 03/14] gnu: openmpi: Upgrade to 1.8.5 ericbavier
2015-06-28 9:10 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 04/14] gnu: Update scotch to 6.0.4 ericbavier
2015-06-28 9:12 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 05/14] gnu: scotch, pt-scotch: Use modify-phases ericbavier
2015-06-28 9:15 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 06/14] gnu: scotch, pt-scotch: Build esmumps libraries ericbavier
2015-06-28 9:14 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 07/14] gnu: Add ScaLAPACK ericbavier
2015-06-28 9:12 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 08/14] gnu: Add p4est ericbavier
2015-06-28 20:03 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 09/14] gnu: Add METIS ericbavier
2015-06-28 20:03 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 10/14] gnu: Add MUMPS ericbavier
2015-06-28 20:12 ` Ludovic Courtès
2015-06-28 15:59 ` Eric Bavier
2015-06-28 3:45 ` [PATCH 11/14] gnu: petsc: Upgrade to 3.6.0 ericbavier
2015-06-28 20:13 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 12/14] gnu: Add arpack-ng-openmpi ericbavier
2015-06-28 20:13 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 13/14] gnu: Add SLEPc ericbavier
2015-06-28 20:18 ` Ludovic Courtès
2015-06-28 3:45 ` [PATCH 14/14] gnu: Add deal.II ericbavier
2015-06-28 20:22 ` Ludovic Courtès
2015-06-28 16:05 ` Eric Bavier
2015-06-28 21:09 ` Andreas Enge
2015-06-29 8:39 ` Ludovic Courtès
2015-06-30 19:55 ` Eric Bavier
2015-07-04 7:40 ` Mark H Weaver
2015-07-05 10:20 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435463151-32099-3-git-send-email-ericbavier@openmailbox.org \
--to=ericbavier@openmailbox.org \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).