From mboxrd@z Thu Jan 1 00:00:00 1970 From: ericbavier@openmailbox.org Subject: =?UTF-8?q?=5BPATCH=2001/14=5D=20gnu=3A=20hwloc=3A=20Upgrade=20to=201=2E10=2E1=2E?= Date: Sat, 27 Jun 2015 22:45:38 -0500 Message-ID: <1435463151-32099-2-git-send-email-ericbavier@openmailbox.org> References: <1435463151-32099-1-git-send-email-ericbavier@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z93WJ-0000r5-Tl for guix-devel@gnu.org; Sat, 27 Jun 2015 23:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z93WF-0003S7-Nu for guix-devel@gnu.org; Sat, 27 Jun 2015 23:44:39 -0400 Received: from smtp25.openmailbox.org ([62.4.1.59]:39992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z93WF-0003Rz-Ep for guix-devel@gnu.org; Sat, 27 Jun 2015 23:44:35 -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/patches/hwloc-gather-topology-lstopo.patch: New patch. * gnu/packages/mpi.scm (hwloc): Upgrade to 1.10.1. [source]: Use patch. [propagated-inputs]: Remove libpci. [inputs]: Add libpciaccess. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/mpi.scm | 23 ++++++++++------= ------ .../patches/hwloc-gather-topology-lstopo.patch | 13 ++++++++++++ 3 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/hwloc-gather-topology-lstopo.pat= ch diff --git a/gnu-system.am b/gnu-system.am index a420d71..2d45e40 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -461,6 +461,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/hop-linker-flags.patch \ + gnu/packages/patches/hwloc-gather-topology-lstopo.patch \ gnu/packages/patches/hydra-automake-1.15.patch \ gnu/packages/patches/hydra-disable-darcs-test.patch \ gnu/packages/patches/irrlicht-mesa-10.patch \ diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 8e62da9..0e1016e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2014 Eric Bavier +;;; Copyright =C2=A9 2014, 2015 Eric Bavier ;;; Copyright =C2=A9 2014 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2014 Ian Denhardt ;;; @@ -39,30 +39,29 @@ (define-public hwloc (package (name "hwloc") - (version "1.9") + (version "1.10.1") (source (origin (method url-fetch) (uri (string-append "http://www.open-mpi.org/software/hwlo= c/v" - version "/downloads/hwloc-" - version ".tar.bz2")) + (version-major+minor version) + "/downloads/hwloc-" version ".tar.bz2"= )) (sha256 (base32 - "0zjgiili2a8v63s8ly3a8qp8ibxv1jw3zbgm7diic3w1qgqiza14"))= )) + "0jji5rphy05s0lp6bknn8lxwixrq0hy5rjzsqvhjszbkl2li7kim")) + (patches (list + (search-patch "hwloc-gather-topology-lstopo.patc= h"))))) (build-system gnu-build-system) - (arguments - ;; Enable libpci support, which effectively makes hwloc GPLv2+. - '(#:configure-flags '("--enable-libpci"))) (inputs `(("libx11" ,libx11) ("cairo" ,cairo) ("ncurses" ,ncurses) + ("libpciaccess" ,libpciaccess) ("expat" ,expat))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - ;; 'hwloc.pc' refers to libpci and libnuma, hence the propagation. - `(("numactl" ,numactl) - ("pciutils" ,pciutils))) + ;; 'hwloc.pc' refers to libnuma, hence the propagation. + `(("numactl" ,numactl))) (home-page "http://www.open-mpi.org/projects/hwloc/") (synopsis "Abstraction of hardware architectures") (description @@ -77,8 +76,6 @@ exploit it accordingly and efficiently. hwloc may display the topology in multiple convenient formats. It also = offers a powerful programming interface to gather information about the hardwar= e, bind processes, and much more.") - - ;; But see above about linking against libpci. (license bsd-3))) =20 (define-public openmpi diff --git a/gnu/packages/patches/hwloc-gather-topology-lstopo.patch b/gn= u/packages/patches/hwloc-gather-topology-lstopo.patch new file mode 100644 index 0000000..06f47ae --- /dev/null +++ b/gnu/packages/patches/hwloc-gather-topology-lstopo.patch @@ -0,0 +1,13 @@ +Derived from upstream commit 0a32f719c. + +--- hwloc-1.10.1/tests/linux/Makefile.in 2015-01-26 03:37:52.000000000 -= 0600 ++++ hwloc-1.10.1/tests/linux/Makefile.in 2015-06-15 11:21:49.824842511 -= 0500 +@@ -1633,7 +1633,7 @@ +=20 +=20 + install-exec-hook: +- $(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddi= r/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bindir)/hwlo= c-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-topology.= tmp $(DESTDIR)$(bindir)/hwloc-gather-topology ++ $(SED) -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top= _builddir/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bind= ir)/hwloc-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-t= opology.tmp $(DESTDIR)$(bindir)/hwloc-gather-topology + chmod +x $(DESTDIR)$(bindir)/hwloc-gather-topology +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. --=20 2.2.1