ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 11:09:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hdf4: Fix compiling with gfortran 10.

Browse source 
* gnu/packages/maths.scm (hdf4)[arguments]: Add 'allow-argument-mismatch' flag
  for gfortran in 'configure-flags'. Fix regexp in 'patch-settings' phase.
This commit is contained in:
Guillaume Le Vaillant 2021-08-20 13:45:49 +02:00
parent f91097c509
commit 979611d4dd
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/maths.scm
View file

@ -1083,6 +1083,8 @@ (define-public hdf4
(arguments (arguments
`(#:parallel-tests? #f `(#:parallel-tests? #f
#:configure-flags (list "--enable-shared" #:configure-flags (list "--enable-shared"
"FCFLAGS=-fallow-argument-mismatch"
"FFLAGS=-fallow-argument-mismatch"
(string-append "CPPFLAGS=-I" (string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "libtirpc") (assoc-ref %build-inputs "libtirpc")
"/include/tirpc")) "/include/tirpc"))
@ -1116,7 +1118,7 @@ (define-public hdf4
;; .so-files. We truncate the hashes to avoid ;; .so-files. We truncate the hashes to avoid
;; unnecessary store references to those compilers: ;; unnecessary store references to those compilers:
(substitute* "libhdf4.settings" (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) "..."))) (string-append prefix (string-take hash 10) "...")))
#t)) #t))
(add-after 'install 'provide-absolute-libjpeg-reference (add-after 'install 'provide-absolute-libjpeg-reference