From patchwork Mon May 2 13:28:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 39058 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 5990727BBEB; Mon, 2 May 2022 14:29:12 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 1395927BBE9 for ; Mon, 2 May 2022 14:29:12 +0100 (BST) Received: from localhost ([::1]:53988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlW6x-0003R5-8w for patchwork@mira.cbaines.net; Mon, 02 May 2022 09:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlW6o-0003Ow-Mw for guix-patches@gnu.org; Mon, 02 May 2022 09:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41269) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlW6o-00014T-EP for guix-patches@gnu.org; Mon, 02 May 2022 09:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlW6o-0002p6-An for guix-patches@gnu.org; Mon, 02 May 2022 09:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50080] [PATCH v3 1/4] gnu: petsc-openmpi: Fix header inclusions. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 13:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50080@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 50080-submit@debbugs.gnu.org id=B50080.165149812210791 (code B ref 50080); Mon, 02 May 2022 13:29:02 +0000 Received: (at 50080) by debbugs.gnu.org; 2 May 2022 13:28:42 +0000 Received: from localhost ([127.0.0.1]:35154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlW6U-0002ny-8W for submit@debbugs.gnu.org; Mon, 02 May 2022 09:28:42 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:54308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlW6S-0002nS-Fl for 50080@debbugs.gnu.org; Mon, 02 May 2022 09:28:41 -0400 Date: Mon, 02 May 2022 13:28:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651498113; bh=mIrIdwTeO1X9PutOqgIPZM9hsn9ZKSy0XRZHq3V5XBQ=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=HoQx5hjj9zqNUsCj5UxTStnOVSxJ7GlF6wQSt/wtjxGgrk3daYVNLg3w0qEnmTlEM Gxk4aHVbIrCODaOyjIKmDVrSrSWXNKz75vkJ5X5dWpi5b7O8xkVafwhjcg0duexFXx aqFQGLwSLnx/wfGuSAc3jACyCxRHawr5UNZrE5BJWi8mOP9b0KCmxEPWy/jtxiLdNo SqALeE/tskStgMDF7FW7aPB221mk/vM3m9PwMe2xu0mT9UxBsFvZ2kyM4mALcFmc3P pxkqCCGFV3kKHujUOGvPBgRiTUF3zGFVcymMQpuRXAYX94dFca1fSoQZ5JuzhDA2Oi dfxpK+VnLu/yg== From: "Paul A. Patience" Message-ID: <20220502132806.614632-2-paul@apatience.com> In-Reply-To: <20220502132806.614632-1-paul@apatience.com> References: <20220502132806.614632-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (petsc-openmpi)[arguments]: Add 'patch-header-inclusions' phase. --- gnu/packages/maths.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.36.0 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fcd9c5482f..2922d95a70 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3174,7 +3174,16 @@ (define-public petsc-openmpi (("libptesmumps") "libesmumps") (("libptscotchparmetis") "libptscotchparmetisv3")))) (add-before 'configure 'mpi-setup - #$%openmpi-setup))))) + #$%openmpi-setup) + (add-after 'install 'patch-header-inclusions + ;; TODO: Replace with ‘patch-header-inclusions’ when (some form + ;; of) https://issues.guix.gnu.org/54780#19 is merged. + (lambda _ + (substitute* (string-append #$output "/include/petsclayouthdf5.h") + (("<(H5Ipublic.h)>" _ header) + (format #f "<~a/include/~a>" + #$(this-package-input "hdf5-parallel-openmpi") + header))))))))) (synopsis "Library to solve PDEs (with MUMPS and MPI support)"))) (define-public petsc-complex-openmpi