Subject: bug#66204: closed (Re: [bug#66204] [PATCH] gnu: hdf-eos5: Update to 2.0.)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 30 Sep 2023 09:41:02 +0000

Your bug report

#66204: [PATCH] gnu: hdf-eos5: Update to 2.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
66204: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66204
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#66204] [PATCH] gnu: hdf-eos5: Update to 2.0.
From: Christopher Baines <[email-masked]>
To: David Elsing <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Sat, 30 Sep 2023 10:39:31 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

David Elsing <[email-masked]> writes:

> * 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(-)

Thanks for the patch! I've pushed this to master as
d78bbb912c26e6f9329e82e22dd444488cd87979.

Chris

Subject: [PATCH] gnu: hdf-eos5: Update to 2.0.
From: David Elsing <[email-masked]>
To: [email-masked]
Cc: David Elsing <[email-masked]>
Date: Mon, 25 Sep 2023 21:27:18 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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 <HE5_HdfEosDef.h>" orig)
+                 (string-append "#include <HE5_config.h>\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
-- 
2.41.0