diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2015-11-19 17:47:15 -0600 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2015-11-20 11:58:40 -0600 |
| commit | 2f5b6a1f1815a4e2118dabdb65aa8471b11badec (patch) | |
| tree | b04124b8f7c857bdecf090eb1e8056983e791534 | |
| parent | 02979664953d170291481fa978eff87a707247ca (diff) | |
| download | gnu-guix-2f5b6a1f1815a4e2118dabdb65aa8471b11badec.tar gnu-guix-2f5b6a1f1815a4e2118dabdb65aa8471b11badec.tar.gz | |
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.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/mpi.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/hwloc-gather-topology-lstopo.patch | 13 |
3 files changed, 2 insertions, 18 deletions
diff --git a/gnu-system.am b/gnu-system.am index edba1c0946..d640c94587 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -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 \ diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 8dba82d8fa..87aa763747 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -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) diff --git a/gnu/packages/patches/hwloc-gather-topology-lstopo.patch b/gnu/packages/patches/hwloc-gather-topology-lstopo.patch deleted file mode 100644 index 06f47aecaa..0000000000 --- a/gnu/packages/patches/hwloc-gather-topology-lstopo.patch +++ /dev/null @@ -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. |