From patchwork Mon Jul 3 22:00:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14529 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 BEA8D27BBEA; Mon, 3 Jul 2023 23:02:08 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 21FF127BBE2 for ; Mon, 3 Jul 2023 23:02:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGRcS-0003Ly-4X; Mon, 03 Jul 2023 18:02:04 -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 1qGRcQ-0003KK-Up for guix-patches@gnu.org; Mon, 03 Jul 2023 18:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGRcQ-00044I-LQ for guix-patches@gnu.org; Mon, 03 Jul 2023 18:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGRcQ-0007DS-HW; Mon, 03 Jul 2023 18:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64448] [PATCH 2/2] gnu: hdf5-1.14: Remove spurious include directories. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 22:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64448@debbugs.gnu.org Cc: David Elsing , andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net X-Debbugs-Original-Xcc: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net Received: via spool by 64448-submit@debbugs.gnu.org id=B64448.168842166427638 (code B ref 64448); Mon, 03 Jul 2023 22:02:02 +0000 Received: (at 64448) by debbugs.gnu.org; 3 Jul 2023 22:01:04 +0000 Received: from localhost ([127.0.0.1]:34594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGRbU-0007Bd-6S for submit@debbugs.gnu.org; Mon, 03 Jul 2023 18:01:04 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGRbS-0007At-V7 for 64448@debbugs.gnu.org; Mon, 03 Jul 2023 18:01:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6F2BB240027 for <64448@debbugs.gnu.org>; Tue, 4 Jul 2023 00:00:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1688421657; bh=lZUbEeBIFSoiWxy2EBNNKwvP5ExvDr5wqYjE+Zj5GGM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=bm17PCq3gy9F6BMv+2ceOwnS6AYPdpOu+vDWJ4gVMz7Hk3d3BBOO/fIo/kY4asl1Z 8Sb0czm5Fyf45euMSa2cS0llO6K5han87qFwN0tBE1ezB/BIhQtnfrZIhRaNMzRKOy EDVYBUQYcB2iERrjLVHd1z7fDPKNIPpXh8obLuxISyL5zIjWdYICzJ6x7qXrNt381d TjTOCBuBt4Pk8rHUM0A0WI1qsM+j/+Q+l6BsZWhG3qecduyKUtgkgOck0JUxwD9bt8 GI/7eKiEbgF/VfGvyXksZVhrczXRgW4RH99EfMkN5UD4OcBLXnSFiKawPL9QXGg6++ ScIrI8Da/RGSw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qw0HF0T6tz6tvy; Tue, 4 Jul 2023 00:00:56 +0200 (CEST) From: David Elsing Date: Mon, 3 Jul 2023 22:00:47 +0000 Message-Id: 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 * gnu/packages/maths.scm (hdf5-1.14)[arguments]: Use 'substitute-keyword-arguments' to add 'remove-subfiling-cppflags phase. --- gnu/packages/maths.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b2029db615..5ba9e07058 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1672,7 +1672,18 @@ (define-public hdf5-1.14 (base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4")) (modules '((guix build utils))) (snippet hdf5-snippet) - (patches (search-patches "hdf5-config-date.patch")))))) + (patches (search-patches "hdf5-config-date.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments hdf5-1.10) + ((#:phases phases) + #~(modify-phases #$phases + ;; Remove include flag to directory in source tree + (add-after 'configure 'remove-subfiling-cppflags + (lambda _ + (substitute* '("src/libhdf5.settings" + "bin/h5cc" + "c++/src/h5c++") + (("-I.*/src/H5FDsubfiling") "")))))))))) (define-public hdf5 ;; Default version of HDF5.