From patchwork Mon Nov 18 14:59:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 70506 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 498C627BBE9; Mon, 18 Nov 2024 15:02:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D5BD27BBE2 for ; Mon, 18 Nov 2024 15:02:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD3Gx-0004Lu-8p; Mon, 18 Nov 2024 10:02:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tD3FT-0003u3-Q5 for guix-patches@gnu.org; Mon, 18 Nov 2024 10:01:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tD3FT-0000aJ-Ct for guix-patches@gnu.org; Mon, 18 Nov 2024 10:01:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ckMfPv4sj8LhR4jH1643vTmUMS86+TuTDl33ObBhFUU=; b=fc+WCsYD4pp5xeGuQyFF2CKpJMT/bXBe8b1D9OonOvsbMxocqUKBkNosXvyq7zf2MgLBLxqnmkyYg7CCjH2/7VDyFmooQnHcjMIMa1lzCaP6VNdE7Zdw1adI9JZsBzHndd0JUd5OoNa2jQg+G+Cw7wCeRFeIz7pZieu40wBgbF4Tmg5cxcKnTQXsk7XRdA8EP0xqOau/g1v1zwhqxqVqF6raPm4h7x9dGXFRxb96fMoESxYPBfWKJ0YpKtM7TC2DzBnUpdtuOYetP+3HZiHiWWG4ZAP+WkwF+s1Dbsq4q3IvrjsWmnkjCu6NirXkGImZStORoDzcSeKc09Ybx6Jk2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tD3FQ-00074e-FN; Mon, 18 Nov 2024 10:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74419] [PATCH 4/5] gnu: libfabric: Enable libcxi support. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Mon, 18 Nov 2024 15:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74419@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Leo Famulari , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Wilko Meyer Received: via spool by 74419-submit@debbugs.gnu.org id=B74419.173194202827081 (code B ref 74419); Mon, 18 Nov 2024 15:01:04 +0000 Received: (at 74419) by debbugs.gnu.org; 18 Nov 2024 15:00:28 +0000 Received: from localhost ([127.0.0.1]:34756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tD3Eq-00072i-7J for submit@debbugs.gnu.org; Mon, 18 Nov 2024 10:00:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tD3Em-00071m-Vn for 74419@debbugs.gnu.org; Mon, 18 Nov 2024 10:00:25 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tD3Eh-0000Rd-OY; Mon, 18 Nov 2024 10:00:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ckMfPv4sj8LhR4jH1643vTmUMS86+TuTDl33ObBhFUU=; b=NRmrANSnvEgoTHQG1SVU SK8gF98GyMT1RTjxJK8HeeQwUNwJocF+uyhnIrLlO0NGC/KBOKtj9BWy36ktAqbkIiqoEjM2VJJOd g5uu74Kzykz+jaEhKLk2FzgftpvvBqFCrfu6A1w92sFUu1GxZ9USmWuqHy6Z2MT45xD9X11OT1mXl 8QyqnHR7UjPDROWx3VkR7Lj/4na1DuJ9itPQSI4E+A2bD3OhgKxd8z44iHtjQmjxHNW/gtTOwjfgL s0Kxprfs5Cgr1oj4W00iXHpviqw34E/BuvdCeUDruTT4d7xTpSTaC4DKs3ujiNWsCE5cphYQYEK+P 5mFGW4jJIokgBA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Nov 2024 15:59:19 +0100 Message-ID: <3b94d179f5fa0fb4a0c443f4cb41225888eb280f.1731940961.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès * gnu/packages/linux.scm (libfabric)[inputs]: Add libcxi, curl, and json-c if libcxi supports the target system. [arguments]: Add #:phases. Change-Id: I3345cac68603c776ec4953cf0e97a12389c30635 --- gnu/packages/linux.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6b2a0c201e..2bd1e14c0c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9116,21 +9116,37 @@ (define-public libfabric (build-system gnu-build-system) (inputs (let ((if-supported ;XXX: copied from openmpi - (lambda (package) + (lambda (package . extra) (if (and (not (%current-target-system)) (member (%current-system) (package-supported-systems package))) - (list package) + (cons package extra) '())))) (append (list rdma-core libnl) (if-supported psm) - (if-supported psm2)))) + (if-supported psm2) + (if-supported libcxi curl json-c)))) (arguments (list #:configure-flags #~(append (if #$(target-64bit?) (list "--enable-efa") '()) - (list "--enable-verbs")))) + (list #$@(if (this-package-input "libcxi") + #~("--enable-cxi") + #~()) + "--enable-verbs")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-libtool-archive + (lambda _ + ;; 'libfabric.la' has '-ljson-c' without a corresponding + ;; '-L' in 'dependency_libs', which in turn causes users + ;; such as Open MPI to fail at link time due to '-ljson-c' + ;; not being found, even when building a shared library. + ;; So, remove the .la file. + (delete-file + (string-append #$output + "/lib/libfabric.la"))))))) (home-page "https://ofiwg.github.io/libfabric/") (synopsis "Open Fabric Interfaces") (description