From 8db4e704dc9c6e86c98d7357b85793dea493ff8f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 31 Mar 2020 11:06:30 +0200
Subject: gnu: hwloc@2: Skip test that fails on emulated hardware.

Works around <https://bugs.gnu.org/40342>.

* gnu/packages/mpi.scm (hwloc-2)[arguments]: Add
'skip-test-that-fails-on-qemu' phase.
---
 gnu/packages/mpi.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'gnu/packages/mpi.scm')

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index ec0684168e..3de2f40fda 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -158,6 +158,14 @@ bind processes, and much more.")
                (substitute* "tests/hwloc/linux-libnuma.c"
                  (("numa_available\\(\\)")
                   "-1"))
+               #t))
+           (add-before 'check 'skip-test-that-fails-on-qemu
+             (lambda _
+               ;; Skip test that fails on emulated hardware due to QEMU bug:
+               ;; <https://bugs.gnu.org/40342>.
+               (substitute* "tests/hwloc/hwloc_get_last_cpu_location.c"
+                 (("hwloc_topology_init" all)
+                  (string-append "exit (77);\n" all)))
                #t))))))))
 
 (define-deprecated hwloc-2.0 hwloc-2)
-- 
cgit v1.2.3


From 06efbe2fbab1475e4f82f410ee5cd27620b23bf4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 31 Mar 2020 11:19:07 +0200
Subject: gnu: hwloc@2: Update to 2.2.0.

* gnu/packages/mpi.scm (hwloc-2): Update to 2.2.0.
---
 gnu/packages/mpi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/mpi.scm')

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 3de2f40fda..b39c50779a 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -135,7 +135,7 @@ bind processes, and much more.")
   ;; Note: 2.0 isn't the default yet, see above.
   (package
     (inherit hwloc-1)
-    (version "2.1.0")
+    (version "2.2.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.open-mpi.org/software/hwloc/v"
@@ -143,7 +143,7 @@ bind processes, and much more.")
                                   "/downloads/hwloc-" version ".tar.bz2"))
               (sha256
                (base32
-                "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"))))
+                "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f"))))
 
     ;; libnuma is no longer needed.
     (inputs (alist-delete "numactl" (package-inputs hwloc-1)))
-- 
cgit v1.2.3