From 979611d4ddb3e4fcd23b53ae05836750939dfdec Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 20 Aug 2021 13:45:49 +0200 Subject: 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(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a7931e6eeb..82ca9caff3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1083,6 +1083,8 @@ (define-public hdf4 (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 @@ (define-public hdf4 ;; .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 -- cgit v1.2.3