From patchwork Mon Sep 25 21:27:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 54293 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 EECA427BBE2; Mon, 25 Sep 2023 22: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5BBA427BBE9 for ; Mon, 25 Sep 2023 22:29:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkt8N-0001i2-Af; Mon, 25 Sep 2023 17:28:51 -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 1qkt8L-0001ho-JK for guix-patches@gnu.org; Mon, 25 Sep 2023 17:28:49 -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 1qkt8L-0006RY-B2 for guix-patches@gnu.org; Mon, 25 Sep 2023 17:28:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkt8X-0006Lu-SP for guix-patches@gnu.org; Mon, 25 Sep 2023 17:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66204] [PATCH] gnu: hdf-eos5: Update to 2.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2023 21:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66204 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66204@debbugs.gnu.org Cc: David Elsing X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169567730224345 (code B ref -1); Mon, 25 Sep 2023 21:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2023 21:28:22 +0000 Received: from localhost ([127.0.0.1]:46826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkt7u-0006Ka-As for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:28:22 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkt7s-0006KJ-JW for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:28:21 -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 1qkt7a-0001ZH-Mz for guix-patches@gnu.org; Mon, 25 Sep 2023 17:28:02 -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 1qkt7Y-0006LN-4v for guix-patches@gnu.org; Mon, 25 Sep 2023 17:28:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0ECBC240101 for ; Mon, 25 Sep 2023 23:27:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695677278; bh=DyZi8e6zQWtyJBsWjQjSQxeD9cGCI5+t9OHqId9nNgc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=e23Tk8v/5wVq9eemAWJI7gysa3yliWGhTnBt+MwyXbFEZeh9kXqHrP9EuYUcrYGJS DPpVjMn7UuUf2+Z9+HStB0Ybc1EH5b98dUTx5poT+PVt8MSAiP4a7Wdii+Y4V5OgJ6 Sp4GzJCT2h8w5txHTt2F8jbDqus+DcHAdpvrJWbXFxs+3xuYlvnpnnaft48OL3mgdL lZHJShDfxa5mk9hgnThj5ggBJHqnSCBmYZnuGZYGsSUpjftISXaWZNGQCJh1jXmXeE j6EkU2VYe1ZpeB7Au7DJVzzcpcAYziPnQwCIAJK5fNFscPzUUPnIZHWbvXjGFB/axX wk67qzAkCTL1w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RvbZP4Vklz9s03; Mon, 25 Sep 2023 23:27:57 +0200 (CEST) From: David Elsing Date: Mon, 25 Sep 2023 21:27:18 +0000 Message-ID: <6bdf4579454a1147bb8430c472ab291e602aea05.1695677238.git.david.elsing@posteo.net> 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 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 * gnu/packages/maths.scm (hdf-eos5): Update to 2.0. [source]: Change URL and add snippet to remove generated files. [native-inputs]: Add autoconf, automake and libtool. [inputs]: Replace hdf5-1.8 with hdf5-1.14. [arguments]: Do not use quasiquote and add the phases remove-single-module-flag and fix-parallel-tests. --- gnu/packages/maths.scm | 57 ++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6141c09886..f5c925c38f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1741,27 +1741,52 @@ (define-public hdf-eos2 (define-public hdf-eos5 (package (name "hdf-eos5") - (version "1.15") - (source (origin - (method url-fetch) - (uri (string-append "ftp://edhs1.gsfc.nasa.gov\ -/edhs/hdfeos5/latest_release/HDF-EOS5." version ".tar.Z")) - (sha256 - (base32 - "1p83333nzzy8rn5chxlm0hrkjjnhh2w1ji8ac0f9q4xzg838i58i")) - (patches (search-patches "hdf-eos5-build-shared.patch" - "hdf-eos5-remove-gctp.patch" - "hdf-eos5-fix-szip.patch" - "hdf-eos5-fortrantests.patch")))) + (version "2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://git.earthdata.nasa.gov/projects/DAS/repos/hdfeos5/raw/" + "hdf-eos5-" version "-src.tar.gz?at=refs/heads/HDFEOS5_" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0by82zznms00b0d5v4iv8a7jff6xm9hzswsx4mfzw2gyy1q4ghyp")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each delete-file (find-files "." "Makefile\\.in$")) + (for-each delete-file (find-files "m4" "^l.*\\.m4$")) + (delete-file "configure") + (delete-file "aclocal.m4"))))) (native-inputs - (list gfortran)) + (list autoconf automake gfortran libtool)) (build-system gnu-build-system) (inputs - (list hdf5-1.8 zlib gctp)) + (list hdf5-1.14 zlib gctp)) (arguments - `(#:configure-flags '("--enable-install-include" "--enable-shared" + (list + #:configure-flags ''("--enable-install-include" "--enable-shared" "CC=h5cc -Df2cFortran" "LIBS=-lgctp") - #:parallel-tests? #f)) + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-single_module-flag + (lambda _ + (substitute* "src/Makefile.am" + ((",-single_module") "")))) + (add-after 'unpack 'fix-parallel-tests + (lambda _ + (substitute* (find-files "testdrivers" "\\.c$") + (("#include " orig) + (string-append "#include \n" orig))) + ;; pthread is already linked. + (substitute* "testdrivers/threads/Makefile.am" + (("(LDADD=\\$\\(LIBHDFEOS5\\) \\$\\(LIBGCTP\\)) pthread" _ rest) + rest)) + ;; This file is missing in the testdrivers/threads directory. + (copy-file "testdrivers/point/simple.txt" + "testdrivers/threads/simple.txt")))))) (synopsis "HDF5-based data format for NASA's Earth Observing System") (description "HDF-EOS5 is a software library built on HDF5 to support the construction