all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 72734@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludovic.courtes@inria.fr>,
	"Leo Famulari" <leo@famulari.name>, "Wilko Meyer" <w@wmeyer.eu>
Subject: [bug#72734] [PATCH] gnu: libfabric: Depend on PSM2 only on supported systems.
Date: Tue, 20 Aug 2024 16:58:41 +0200	[thread overview]
Message-ID: <5a4c44b1676fe59b115e132771cebf686f060f39.1724165876.git.ludo@gnu.org> (raw)

From: Ludovic Courtès <ludovic.courtes@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





             reply	other threads:[~2024-08-20 14:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-20 14:58 Ludovic Courtès [this message]
2024-08-26 12:07 ` [bug#72734] [PATCH] gnu: libfabric: Depend on PSM2 only on supported systems Marcel van der Boom
2024-08-31 16:34   ` bug#72734: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5a4c44b1676fe59b115e132771cebf686f060f39.1724165876.git.ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=72734@debbugs.gnu.org \
    --cc=leo@famulari.name \
    --cc=ludovic.courtes@inria.fr \
    --cc=w@wmeyer.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.