GNU bug report logs - #72734
[PATCH] gnu: libfabric: Depend on PSM2 only on supported systems.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: guix-patches <at> gnu.org
Cc: Ludovic Courtès <ludovic.courtes <at> inria.fr>
Subject: [PATCH] gnu: libfabric: Depend on PSM2 only on supported systems.
Date: Tue, 20 Aug 2024 16:58:41 +0200

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>

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 a2a3601246..fecae036fb 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8928,17 +8928,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")

base-commit: ce40b1c655edab622b4ad9ff49f948bd65753662
-- 
2.45.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.