summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2015-06-14 17:11:00 -0500
committerEric Bavier <bavier@member.fsf.org>2015-06-29 15:34:36 -0500
commitce7d9c989de569712b96f3bbb6c5db4d4c5595a9 (patch)
treeb1bc4bc3d57ce86298e006b288dbf2f260456eb1 /gnu/packages/patches
parent7362371da5adee0d9d44e9a4a24cbef4b7a5c529 (diff)
gnu: hwloc: Upgrade to 1.10.1.
* 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.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/hwloc-gather-topology-lstopo.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/patches/hwloc-gather-topology-lstopo.patch b/gnu/packages/patches/hwloc-gather-topology-lstopo.patch
new file mode 100644
index 0000000000..06f47aecaa
--- /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 @@
+
+
+ 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.