diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-12-01 23:11:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-12-01 23:30:15 +0100 |
| commit | 36f18626a9f8e9ba287e0fd3f1d0400345ca5ee7 (patch) | |
| tree | 0e4b51f503bb30db33898d55e1b96385d894d7ae /gnu/packages/maths.scm | |
| parent | 725d35aa9aa12a843050379010a1591fb244c9b1 (diff) | |
gnu: petsc-{complex,openmpi,complex-openmpi}: Use gexps.
This is a followup to 07ac13a26a0d7c8319afb42c55fc2116ec44668f, which
omitted to switch to gexps in packages that inherit from 'petsc'.
Reported by Mathieu Othacehe <othacehe@gnu.org>.
* gnu/packages/maths.scm (petsc-complex)[arguments]: Use gexps.
(petsc-openmpi)[arguments]: Likewise.
(petsc-complex-openmpi)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5d56f00095..14aecb955d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2984,16 +2984,18 @@ scientific applications modeled by partial differential equations.") "https://www.mcs.anl.gov/petsc/documentation/copyright.html")))) (define-public petsc-complex - (package (inherit petsc) + (package + (inherit petsc) (name "petsc-complex") (arguments (substitute-keyword-arguments (package-arguments petsc) ((#:configure-flags cf) - `(cons "--with-scalar-type=complex" ,cf)))) + #~(cons "--with-scalar-type=complex" #$cf)))) (synopsis "Library to solve PDEs (with complex scalars)"))) (define-public petsc-openmpi - (package (inherit petsc) + (package + (inherit petsc) (name "petsc-openmpi") (inputs `(("hdf5" ,hdf5-parallel-openmpi) @@ -3007,27 +3009,28 @@ scientific applications modeled by partial differential equations.") (arguments (substitute-keyword-arguments (package-arguments petsc) ((#:configure-flags cf) - ``("--with-hypre=1" - "--with-mpiexec=mpirun" - "--with-metis=1" - "--with-mumps=1" - "--with-scalapack=1" - "--with-ptscotch=1" - ,(string-append "--with-mpi-dir=" - (assoc-ref %build-inputs "openmpi")) - ,(string-append "--with-hdf5-include=" - (assoc-ref %build-inputs "hdf5") "/include") - ,(string-append "--with-hdf5-lib=" - (assoc-ref %build-inputs "hdf5") "/lib/libhdf5.a") - ,@(delete "--with-mpi=0" ,cf))) + #~`("--with-hypre=1" + "--with-mpiexec=mpirun" + "--with-metis=1" + "--with-mumps=1" + "--with-scalapack=1" + "--with-ptscotch=1" + ,(string-append "--with-mpi-dir=" + #$(this-package-input "openmpi")) + ,(string-append "--with-hdf5-include=" + #$(this-package-input "hdf5") "/include") + ,(string-append "--with-hdf5-lib=" + #$(this-package-input "hdf5") "/lib/libhdf5.a") + ,@(delete "--with-mpi=0" #$cf))) ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'mpi-setup - ,%openmpi-setup))))) + #~(modify-phases #$phases + (add-before 'configure 'mpi-setup + #$%openmpi-setup))))) (synopsis "Library to solve PDEs (with MUMPS and MPI support)"))) (define-public petsc-complex-openmpi - (package (inherit petsc-complex) + (package + (inherit petsc-complex) (name "petsc-complex-openmpi") (inputs `(("openmpi" ,openmpi) @@ -3035,14 +3038,14 @@ scientific applications modeled by partial differential equations.") (arguments (substitute-keyword-arguments (package-arguments petsc-complex) ((#:configure-flags cf) - ``("--with-mpiexec=mpirun" - ,(string-append "--with-mpi-dir=" - (assoc-ref %build-inputs "openmpi")) - ,@(delete "--with-mpi=0" ,cf))) + #~`("--with-mpiexec=mpirun" + ,(string-append "--with-mpi-dir=" + #$(this-package-input "openmpi")) + ,@(delete "--with-mpi=0" #$cf))) ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'mpi-setup - ,%openmpi-setup))))) + #~(modify-phases #$phases + (add-before 'configure 'mpi-setup + #$%openmpi-setup))))) (synopsis "Library to solve PDEs (with complex scalars and MPI support)"))) (define-public python-petsc4py |