nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: petsc: Fix compiler configuration references. 

* gnu/packages/maths.scm (petsc)[arguments]: When patching compiler
  driver paths, do not assume they come from fortran input.
This commit is contained in:
Eric Bavier 2016-03-16 11:29:49 -05:00
parent d588422e13
commit dfdf571688
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/maths.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org> ;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
@ -565,16 +565,15 @@ ASCII text files using Gmsh's own scripting language.")
'install 'clean-install 'install 'clean-install
;; Try to keep installed files from leaking build directory names. ;; Try to keep installed files from leaking build directory names.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out")))
(fortran (assoc-ref inputs "gfortran")))
(substitute* (map (lambda (file) (substitute* (map (lambda (file)
(string-append out "/lib/petsc/conf/" file)) (string-append out "/lib/petsc/conf/" file))
'("petscvariables" "PETScConfig.cmake")) '("petscvariables" "PETScConfig.cmake"))
(((getcwd)) out)) (((getcwd)) out))
;; Make compiler references point to the store ;; Make compiler references point to the store
(substitute* (string-append out "/lib/petsc/conf/petscvariables") (substitute* (string-append out "/lib/petsc/conf/petscvariables")
(("= g(cc|\\+\\+|fortran)" _ suffix) (("= (gcc|g\\+\\+|gfortran)" _ compiler)
(string-append "= " fortran "/bin/g" suffix))) (string-append "= " (which compiler))))
;; PETSc installs some build logs, which aren't necessary. ;; PETSc installs some build logs, which aren't necessary.
(for-each (lambda (file) (for-each (lambda (file)
(let ((f (string-append out "/lib/petsc/conf/" file))) (let ((f (string-append out "/lib/petsc/conf/" file)))