~ruther/guix-local

2f5b6a1f1815a4e2118dabdb65aa8471b11badec — Eric Bavier 10 years ago 0297966 
gnu: hwloc: Update to 1.11.1.

* gnu/packages/mpi.scm (hwloc): Update to 1.11.1.
  [source]: Remove patch.
* gnu/packages/patches/hwloc-gather-topology-lstopo.patch: Delete it.
* gnu-system.am (dist_patch_DATA): Remove it.
patch browse .tar.gz 
3 files changed, 2 insertions(+), 18 deletions(-)

M gnu-system.am
M gnu/packages/mpi.scm
D gnu/packages/patches/hwloc-gather-topology-lstopo.patch

M gnu-system.am => gnu-system.am +0 -1
@@ 502,7 502,6 @@ dist_patch_DATA =						\
  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/icecat-CVE-2015-4513-pt01.patch		\


M gnu/packages/mpi.scm => gnu/packages/mpi.scm +2 -4
@@ 40,7 40,7 @@
(define-public hwloc
  (package
    (name "hwloc")
    (version "1.10.1")
    (version "1.11.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "http://www.open-mpi.org/software/hwloc/v"


@@ 48,9 48,7 @@
                                  "/downloads/hwloc-" version ".tar.bz2"))
              (sha256
               (base32
                "0jji5rphy05s0lp6bknn8lxwixrq0hy5rjzsqvhjszbkl2li7kim"))
              (patches (list
                        (search-patch "hwloc-gather-topology-lstopo.patch")))))
                "03vcr9f98z45xfkk34x376mfrwyi7ff4ay60gvn4v95sqihl0qa8"))))
    (build-system gnu-build-system)
    (inputs
     `(("libx11" ,libx11)


D gnu/packages/patches/hwloc-gather-topology-lstopo.patch => gnu/packages/patches/hwloc-gather-topology-lstopo.patch +0 -13
@@ 1,13 0,0 @@
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 @@
 
 
 install-exec-hook:
-	$(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bindir)/hwloc-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)$(bindir)/hwloc-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp $(DESTDIR)$(bindir)/hwloc-gather-topology
 	chmod +x $(DESTDIR)$(bindir)/hwloc-gather-topology
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.