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
parent
0297966495
commit
2f5b6a1f18
|
@ -502,7 +502,6 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||||
gnu/packages/patches/hop-bigloo-4.0b.patch \
|
gnu/packages/patches/hop-bigloo-4.0b.patch \
|
||||||
gnu/packages/patches/hop-linker-flags.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-automake-1.15.patch \
|
||||||
gnu/packages/patches/hydra-disable-darcs-test.patch \
|
gnu/packages/patches/hydra-disable-darcs-test.patch \
|
||||||
gnu/packages/patches/icecat-CVE-2015-4513-pt01.patch \
|
gnu/packages/patches/icecat-CVE-2015-4513-pt01.patch \
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
(define-public hwloc
|
(define-public hwloc
|
||||||
(package
|
(package
|
||||||
(name "hwloc")
|
(name "hwloc")
|
||||||
(version "1.10.1")
|
(version "1.11.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://www.open-mpi.org/software/hwloc/v"
|
(uri (string-append "http://www.open-mpi.org/software/hwloc/v"
|
||||||
|
@ -48,9 +48,7 @@
|
||||||
"/downloads/hwloc-" version ".tar.bz2"))
|
"/downloads/hwloc-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0jji5rphy05s0lp6bknn8lxwixrq0hy5rjzsqvhjszbkl2li7kim"))
|
"03vcr9f98z45xfkk34x376mfrwyi7ff4ay60gvn4v95sqihl0qa8"))))
|
||||||
(patches (list
|
|
||||||
(search-patch "hwloc-gather-topology-lstopo.patch")))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("libx11" ,libx11)
|
`(("libx11" ,libx11)
|
||||||
|
|
|
@ -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.
|
|
Loading…
Reference in New Issue