me
/
guix
Archived
1
0
Fork 0
Code

gnu: dealii: Use G-expressions. 

* gnu/packages/maths.scm (dealii)[snippet, arguments]: Use
G-expressions.
(dealii-openmpi)[arguments]: Same.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Paul A. Patience 2022-07-25 15:12:02 +00:00 committed by Ludovic Courtès
parent bbf5e033d4
commit 6a15bd031f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gnu/packages/maths.scm
View File

@ -5286,7 +5286,7 @@ A unique design feature of Trilinos is its focus on packages.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled boost, muparser, TBB and UMFPACK. ;; Remove bundled boost, muparser, TBB and UMFPACK.
'(delete-file-recursively "bundled")))) #~(delete-file-recursively "bundled"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(native-inputs (native-inputs
@ -5314,31 +5314,35 @@ A unique design feature of Trilinos is its focus on packages.")
sundials-5 sundials-5
tbb)) tbb))
(arguments (arguments
`(#:build-type "DebugRelease" ; Supports only Debug, Release and DebugRelease. (list #:build-type "DebugRelease" ; Only Debug, Release or DebugRelease.
;; The tests take too long and must be explicitly enabled with "make ;; The tests take too long and must be explicitly enabled with
;; setup_tests". ;; "make setup_tests".
;; See https://www.dealii.org/developer/developers/testsuite.html. ;; See https://www.dealii.org/developer/developers/testsuite.html.
;; (They can also be run for an already installed deal.II.) ;; (They can also be run for an already installed deal.II.)
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags
(let ((doc (string-append (assoc-ref %outputs "doc") #~(let ((doc (string-append #$output:doc "/share/doc/"
"/share/doc/" ,name "-" ,version))) #$name "-" #$version)))
`("-DDEAL_II_COMPONENT_DOCUMENTATION=ON" (list "-DDEAL_II_COMPONENT_DOCUMENTATION=ON"
,(string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) (string-append "-DDEAL_II_DOCREADME_RELDIR=" doc)
,(string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") (string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html")
;; Don't compile the examples because the source and CMakeLists.txt ;; Don't compile the examples because the source and
;; are installed anyway, allowing users to do so for themselves. ;; CMakeLists.txt are installed anyway, allowing users to
;; do so for themselves.
"-DDEAL_II_COMPILE_EXAMPLES=OFF" "-DDEAL_II_COMPILE_EXAMPLES=OFF"
,(string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc "/examples"))) (string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc
"/examples")))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'remove-build-logs (add-after 'install 'remove-build-logs
;; These build logs leak the name of the build directory by storing ;; These build logs leak the name of the build directory by
;; the values of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. ;; storing the values of CMAKE_SOURCE_DIR and
(lambda* (#:key outputs #:allow-other-keys) ;; CMAKE_BINARY_DIR.
(let ((doc (string-append (assoc-ref outputs "doc") (lambda _
"/share/doc/" ,name "-" ,version))) (let ((doc (string-append #$output:doc "/share/doc/"
(for-each delete-file (map (lambda (f) (string-append doc "/" f)) #$name "-" #$version)))
(for-each delete-file
(map (lambda (f) (string-append doc "/" f))
'("detailed.log" "summary.log"))))))))) '("detailed.log" "summary.log")))))))))
(home-page "https://www.dealii.org/") (home-page "https://www.dealii.org/")
(synopsis "Finite element library") (synopsis "Finite element library")
@ -5372,7 +5376,7 @@ in finite element programs.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments dealii) (substitute-keyword-arguments (package-arguments dealii)
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "-DDEAL_II_WITH_MPI=ON" ,flags)))) #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags))))
(synopsis "Finite element library (with MPI support)"))) (synopsis "Finite element library (with MPI support)")))
(define-public flann (define-public flann