guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu: hdf4: Fix compiling with gfortran 10.


From: guix-commits
Subject: 01/03: gnu: hdf4: Fix compiling with gfortran 10.
Date: Fri, 20 Aug 2021 08:12:08 -0400 (EDT)

glv pushed a commit to branch core-updates-frozen
in repository guix.

commit 979611d4ddb3e4fcd23b53ae05836750939dfdec
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Fri Aug 20 13:45:49 2021 +0200

    gnu: hdf4: Fix compiling with gfortran 10.
    
    * gnu/packages/maths.scm (hdf4)[arguments]: Add 'allow-argument-mismatch' 
flag
      for gfortran in 'configure-flags'. Fix regexp in 'patch-settings' phase.
---
 gnu/packages/maths.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a7931e6..82ca9ca 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1083,6 +1083,8 @@ computations.")
     (arguments
      `(#:parallel-tests? #f
        #:configure-flags (list "--enable-shared"
+                               "FCFLAGS=-fallow-argument-mismatch"
+                               "FFLAGS=-fallow-argument-mismatch"
                                (string-append "CPPFLAGS=-I"
                                               (assoc-ref %build-inputs 
"libtirpc")
                                               "/include/tirpc"))
@@ -1116,7 +1118,7 @@ computations.")
              ;; .so-files.  We truncate the hashes to avoid
              ;; unnecessary store references to those compilers:
              (substitute* "libhdf4.settings"
-               (("(/gnu/store/)([a-Z0-9]*)" all prefix hash)
+               (("(/gnu/store/)([0-9A-Za-z]*)" all prefix hash)
                 (string-append prefix (string-take hash 10) "...")))
              #t))
          (add-after 'install 'provide-absolute-libjpeg-reference



reply via email to

[Prev in Thread] Current Thread [Next in Thread]