From patchwork Mon Jul 3 21:58:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 1014 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 19E7927BBEA; Mon, 3 Jul 2023 22:59:30 +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 5D02327BBE2 for ; Mon, 3 Jul 2023 22:59:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGRZb-0002Cm-HE; Mon, 03 Jul 2023 17:59:07 -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 1qGRZZ-0002Cd-Rb for guix-patches@gnu.org; Mon, 03 Jul 2023 17:59:05 -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 1qGRZZ-0003V0-Iy for guix-patches@gnu.org; Mon, 03 Jul 2023 17:59:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGRZW-00075r-DJ; Mon, 03 Jul 2023 17:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64448] [PATCH 0/2] Fix hdf5-1.14 wrappers and remove generated source files from all hdf5 versions. 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 21:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net Received: via spool by submit@debbugs.gnu.org id=B.168842154127258 (code B ref -1); Mon, 03 Jul 2023 21:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2023 21:59:01 +0000 Received: from localhost ([127.0.0.1]:34581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGRZU-00075a-Mq for submit@debbugs.gnu.org; Mon, 03 Jul 2023 17:59:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:46676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGRZQ-00075O-BN for submit@debbugs.gnu.org; Mon, 03 Jul 2023 17:58:59 -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 1qGRZQ-0002Ab-1Z for guix-patches@gnu.org; Mon, 03 Jul 2023 17:58:56 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGRZN-0003Qv-QO for guix-patches@gnu.org; Mon, 03 Jul 2023 17:58:55 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0CCE5240101 for ; Mon, 3 Jul 2023 23:58:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1688421530; bh=XRasyfLG5emYUI48C2zO9uiZ41iRvjuh5loJJFBeMXI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=CqnhD/1WRCR179v2FteuyvJ8TbjKQT/rUb0XCIpWbNlw7o3jCc0vls6LXD+wFB8jW g9/JOG0cu9vNCg/gTj3j+p8DDljAmC4FCEka11nejHemXwZAS0PkRiUv5iLshV0RTv Qs4Es3em7azr+vkL7cLiKJRilsIUC/0+856kcyiXU0c8jqayIC/HO4sGz1PjR/ghHf 1LiORvs0lEIqEr+uZCXP9xez49EFzDNXgFblfTtr6JxtsmMsjhsBBaWtETLlkYGFZk +8mge7Li41lDaVIzY2AC7EmiKsDpmx9mGdknjRSb+gFUrGe/NYyCB3SiOQDP2jemNa lYy8g7Uz0uj5w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qw0Dn3zdKz6tvt; Mon, 3 Jul 2023 23:58:49 +0200 (CEST) From: David Elsing Date: Mon, 3 Jul 2023 21:58:45 +0000 Message-Id: MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=david.elsing@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 When using hdf5 with CMake, I noticed that it does not work for the 1.14 version, because the h5cc and h5c++ wrappers contain the flag "-I/tmp/guix-build-hdf5-1.14.0.drv-0/hdf5-1.14.0/src/H5FDsubfiling". It is required in the 'configure phase, but can be removed afterwards. Additionally, I noticed that the hdf5 source tarballs contain many autogenerated files, so I also removed them. Somehow, the 1.8.23 release is missing two m4 scripts (which are included in later releases, but different from this one), so they are copied from the 1.8.21 tarball (the latest earlier release which includes them). The genparser script is missing as well, which is copied from the 1.10.9 release. David Elsing (2): gnu: hdf5-1.8: Remove generated files from source gnu: hdf5-1.14: Remove spurious include directories. gnu/packages/maths.scm | 234 +++++++++++++++----- gnu/packages/patches/hdf5-config-date.patch | 14 +- 2 files changed, 188 insertions(+), 60 deletions(-) base-commit: 76e39909e886bb51cf9b2fa03a1523545faca880