From 1003d62790c32a5bf33fb09de590bbe459fb39d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 20 Aug 2024 16:54:57 +0200 Subject: [PATCH] gnu: libfabric: Depend on PSM2 only on supported systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a regression introduced in 2a6ea3895bf554a70c699a1013d75ffa5407bcad, that would make ‘libfabric’ unsupported on non-x86_64 systems. * gnu/packages/linux.scm (libfabric)[inputs]: Define ‘if-supported’. Use it for ‘psm’ and ‘psm2, and remove labels. [arguments]: Remove ‘--enable-psm2’, which is unnecessary. Change-Id: I2a52ce6feb52b8773779a401088743491c3ad30b --- gnu/packages/linux.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3ef6479377..318c6ccf13 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8903,17 +8903,20 @@ (define-public libfabric (sha256 (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8")))) (build-system gnu-build-system) - (inputs `(("rdma-core" ,rdma-core) - ,@(match (%current-system) - ((member (package-supported-systems psm)) - `(("psm" ,psm))) - (_ `())) - ("psm2" ,psm2) - ("libnl" ,libnl))) + (inputs + (let ((if-supported ;XXX: copied from openmpi + (lambda (package) + (if (and (not (%current-target-system)) + (member (%current-system) + (package-supported-systems package))) + (list package) + '())))) + (append (list rdma-core libnl) + (if-supported psm) + (if-supported psm2)))) (arguments (list #:configure-flags - #~(list "--enable-psm2" - "--enable-efa" + #~(list "--enable-efa" "--enable-verbs"))) (home-page "https://ofiwg.github.io/libfabric/") (synopsis "Open Fabric Interfaces")