me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hwloc: Update to 2.9.1.

Browse source 
* gnu/packages/mpi.scm (hwloc-2): Update to 2.9.1.

Patch to skip tests requiring /sys on non-x86 systems should not be
necessary anymore, as https://github.com/open-mpi/hwloc/pull/570 has
been merged in this new version.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Philippe SWARTVAGHER 2023-04-03 11:46:19 +02:00 • committed by Maxim Cournoyer
parent fa7b13cc79
commit 58f4d7566f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/mpi.scm
View file

@ -141,7 +141,7 @@ bind processes, and much more.")
(define-public hwloc-2 (define-public hwloc-2
(package (package
(inherit hwloc-1) (inherit hwloc-1)
(version "2.9.0") (version "2.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.open-mpi.org/release/hwloc/v" (uri (string-append "https://download.open-mpi.org/release/hwloc/v"
@ -149,7 +149,7 @@ bind processes, and much more.")
"/hwloc-" version ".tar.bz2")) "/hwloc-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"11v8hnl6fdsdbm3wnz5gg88f2ghixjyl7jlfmywj293ab5iyjw10")))) "17jr14a5ns5rpwvy28fy7xqagbvfprsz7wrsjgh5gx7y40d97i3w"))))
;; libnuma is no longer needed. ;; libnuma is no longer needed.
(inputs (modify-inputs (package-inputs hwloc-1) (inputs (modify-inputs (package-inputs hwloc-1)
@ -168,16 +168,7 @@ bind processes, and much more.")
(add-before 'check 'skip-tests-that-require-/sys (add-before 'check 'skip-tests-that-require-/sys
(lambda _ (lambda _
;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it. ;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it.
(setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0") (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0")))
;; 'hwloc_backends' also requires /sys on non-x86 systems, for
;; which hwloc lacks a topology backend not reliant on the
;; operating system; skip it also on these machines.
(substitute* "tests/hwloc/hwloc_backends.c"
,@(if (not (target-x86?))
'((("putenv\\(\\(char \\*\\) \"HWLOC_L" all)
(string-append "exit (77);\n" all)))
'()))))
(add-before 'check 'skip-test-that-fails-on-qemu (add-before 'check 'skip-test-that-fails-on-qemu
(lambda _ (lambda _
;; Skip test that fails on emulated hardware due to QEMU bug: ;; Skip test that fails on emulated hardware due to QEMU bug: