From patchwork Fri Oct 25 10:46:24 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: 69462 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 144EB27BBEA; Fri, 25 Oct 2024 11:47:47 +0100 (BST) 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=ham 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 8C3E427BBE2 for ; Fri, 25 Oct 2024 11:47:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4Hqw-0005BW-6n; Fri, 25 Oct 2024 06:47:34 -0400 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 1t4Hqt-0005B7-WD for guix-patches@gnu.org; Fri, 25 Oct 2024 06:47:32 -0400 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 1t4Hqs-0003dP-GA for guix-patches@gnu.org; Fri, 25 Oct 2024 06:47:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=nFwgJFHjvHTGmt7PVjlcN09SylPRMytcUeDFy7W+KVE=; b=DcwVEaby76ViXu1grIaruVH1TjUutNCQpJZhiMxb2+U7l7PxB+ENz29aDjy4f284Bh2sVG20H6KIKvw9r6UBMa/4wxX/bN0gpj+LZdSzogY4xG7AO/2O1uZEOjc03LbczLbJpbpNuYUzUUh16fIr+SA9eugu/+BDHHDxYHI6QVUDpvzAZuE/7EZm6iF6VwbiVAitftfq+lS2RVrHMZEvO2deebGA40jumoW/5j7P/ZMV4czE+WDFJM0OuKHngPO0muZ/wyfi0s8awCwjBMzfYH+qtdKZBgFP+bpSJixrg+skD4vzcyO0dx0O5uIXt2vBnS6ShCBPo5U/QUFttey19g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4HrO-0005D6-Ag for guix-patches@gnu.org; Fri, 25 Oct 2024 06:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74011] [PATCH] gnu: prrte: Record the absolute file name of =?utf-8?b?4oCYcHJ0ZWTigJku?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2024 10:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74011 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74011@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172985324019956 (code B ref -1); Fri, 25 Oct 2024 10:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2024 10:47:20 +0000 Received: from localhost ([127.0.0.1]:37511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Hqi-0005Bo-Dv for submit@debbugs.gnu.org; Fri, 25 Oct 2024 06:47:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:35306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Hqg-0005Bf-I8 for submit@debbugs.gnu.org; Fri, 25 Oct 2024 06:47:19 -0400 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 1t4Hq8-00057Y-H9 for guix-patches@gnu.org; Fri, 25 Oct 2024 06:46:45 -0400 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 1t4Hq5-0003aG-Dt; Fri, 25 Oct 2024 06:46:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=nFwgJFHjvHTGmt7PVjlcN09SylPRMytcUeDFy7W+KVE=; b=EbFrVH3HurEyyK GDkRJydsky/7xWohgQ+0ROcTCEApOwDmaG2rQ/RsX5XdOoOp4BZNv8eMhP8Y5Rmmh1RRoimJMbb4E HjPGMY/ioFiBINwsqZEbXEhSWrnO6kBZpOFsVIbgjRa1LwN+JlsGgkjh1IdQ6bUhjHAT6HfIi1zAe Ax8s9y8WJ4SpjbOZEwmzJJnG4K4NA4++6XTZHakAaRZlkMbNy+syslZDqWhtt/NUPo77hAwHQUK56 R6Qg8oH9k2lJ2kCrNyxRBCAg7QAVfFxVJ41AhlctR0mvHB9fAjn7iImuoNYo7JC62bMTjxDMeaxc5 ByhN6uTxaaADi+9+5XCA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 25 Oct 2024 12:46:24 +0200 Message-ID: <8cf9c3e955e22aa68741caa03a33bb28bc0aa73b.1729853141.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 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 Previously a command like: guix shell --pure openmpi@5 openssh intel-mpi-benchmarks \ --with-input=openmpi@4=openmpi@5 slurm -- \ salloc -N2 -- mpirun -np 2 --map-by node IMB-MPI1 PingPong would silently fail due to ‘prted’ not being found in $PATH. * gnu/packages/parallel.scm (prrte)[arguments]: Add ‘patch-prted-reference’ phase. Change-Id: Iff30cb5a4dcc9e9cfe6638d518ee4f19561289a0 --- gnu/packages/parallel.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) base-commit: a1714de3aa4f60d211c166876c3515f96384b0c7 diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 202a98b2bc..85f8a114c3 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -727,7 +727,15 @@ (define-public prrte (("_ABSOLUTE") "") (("PRTE_CONFIGURE_CLI") - "\"[elided to reduce closure]\""))))) + "\"[elided to reduce closure]\"")))) + (add-after 'unpack 'patch-prted-reference + (lambda _ + ;; Record the absolute file name of 'prted' instead of + ;; assuming it will be found in $PATH at run time. + (substitute* "src/runtime/prte_mca_params.c" + (("prte_launch_agent =.*") + (string-append "prte_launch_agent = \"" + #$output "/bin/prted\";\n")))))) #:disallowed-references (list (canonical-package gcc)))) (inputs (list libevent