From mboxrd@z Thu Jan 1 00:00:00 1970 From: ericbavier@openmailbox.org Subject: [PATCH 02/14] gnu: hwloc: Move numactl to inputs. Date: Sat, 27 Jun 2015 22:45:39 -0500 Message-ID: <1435463151-32099-3-git-send-email-ericbavier@openmailbox.org> References: <1435463151-32099-1-git-send-email-ericbavier@openmailbox.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z93WN-0000u9-Mm for guix-devel@gnu.org; Sat, 27 Jun 2015 23:44:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z93WJ-0003V3-Ku for guix-devel@gnu.org; Sat, 27 Jun 2015 23:44:43 -0400 Received: from smtp24.openmailbox.org ([62.4.1.58]:36439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z93WJ-0003U1-FR for guix-devel@gnu.org; Sat, 27 Jun 2015 23:44:39 -0400 In-Reply-To: <1435463151-32099-1-git-send-email-ericbavier@openmailbox.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: Eric Bavier From: Eric Bavier * 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