From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SN++AKbcb2ISEQEAbAwnHQ (envelope-from ) for ; Mon, 02 May 2022 15:29:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gJTCAKbcb2IcHwAAauVa8A (envelope-from ) for ; Mon, 02 May 2022 15:29:10 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A84138AAD for ; Mon, 2 May 2022 15:29:09 +0200 (CEST) Received: from localhost ([::1]:53988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlW6u-0003R5-SV for larch@yhetil.org; Mon, 02 May 2022 09:29:08 -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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651498149; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=mIrIdwTeO1X9PutOqgIPZM9hsn9ZKSy0XRZHq3V5XBQ=; b=N+l1YIr0XiQcWrbZVkw0bWO4n359Bt639r34ihnKFaN6SLSqm+JsyMIllb/EIONcjou9GD JX2J1gZJpe/7j3X6RwcGsiApqtZnYdFXWf7Vq+NIX3W5NQRQjh/8u59hMlbSeib2c5TFPo QQIlMMsHLGyEnNG/ZPSuV7o8OpPC6iRn3W57SWfEv3tC8thatLF4GJi55PmHPrX6+Db/F/ 59iZ852OKbQCPIRGbLz/OE+r7yYBGvCeC0yvy2GDZ7/Cuwsx65gjiDg3PtZ7PM0pmPHY8w 06xMEMHq/zyzQ+o8fFQN+moEHR4VI/eNrnpbP8opLKXCKeUFbdVBiSXWuhivqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651498149; a=rsa-sha256; cv=none; b=o3w31rq0RLuHVxGoFltYiiIFYrl2UT+tS7mVnmF3IPK1sE9kHJbQpDDqGf9jz57Es7CNjo 2R0t2sedJBzTN0MgEhIBLzS//96tXpmC7S4IVaZ6CPkXECfYB4uCSOaDG7o3p/NmuvnR/Z 3NsNq9OqXVfxKa8zklZelHNJmmsqxsd0HY6RmZ4Mb4m51u98qysBHJCHWETs851mh+bwBm nqey4f92IGKp39X41O0Xo1e2REqbbqIrTQwkMoHrkFixDomrRCzZVy1EVIOeJo8cCds+m5 6gW47k8Bo4/3CtNvsQdLBReB3uLK0uORHlCp+90i1P+XdfhNazaRfNvK+/nIOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=HoQx5hjj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=HoQx5hjj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A84138AAD X-Spam-Score: 3.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: F0L2kgaPsZhk * gnu/packages/maths.scm (petsc-openmpi)[arguments]: Add 'patch-header-inclusions' phase. --- gnu/packages/maths.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 =E2=80=98patch-header-inclusions= =E2=80=99 when (some form + ;; of) https://issues.guix.gnu.org/54780#19 is merged. + (lambda _ + (substitute* (string-append #$output "/include/petsclayout= hdf5.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 -- 2.36.0