nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Eric Bavier 2015-11-19 17:47:15 -06:00
parent 0297966495
commit 2f5b6a1f18
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -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 \

6
gnu/packages/mpi.scm
View File

@ -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)

13
gnu/packages/patches/hwloc-gather-topology-lstopo.patch
View File

@ -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.