mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
gnu: mmg: Update to 5.7.1.
* gnu/packages/graphics.scm (mmg): Update to 5.7.1. [arguments]<#:configure-flags>: Set -DCMAKE_INSTALL_MANDIR. Add -DBUILD_DOC=ON and -DUSE_SCOTCH=ON, the defaults of which changed since the last version. Scotch is still autodetected, but explicitly enabling it causes the configuration to fail if it is not found. <#:phases>: Do not copy the manual pages, because the build now does it. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
41e8726c89
commit
bdf3d621bf
1 changed files with 5 additions and 5 deletions
|
@ -2395,7 +2395,7 @@ (define-public discregrid
|
||||||
(define-public mmg
|
(define-public mmg
|
||||||
(package
|
(package
|
||||||
(name "mmg")
|
(name "mmg")
|
||||||
(version "5.6.0")
|
(version "5.7.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -2404,7 +2404,7 @@ (define-public mmg
|
||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "173biz5skbwg27i5w6layg7mydjzv3rmi1ywhra4rx9rjf5c0cc5"))))
|
(base32 "0skb7yzsw6y44zp9gb729i5xks7qd97nvn3z6jhz4jksqksx7lz0"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(outputs '("out" "lib" "doc"))
|
(outputs '("out" "lib" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -2414,11 +2414,14 @@ (define-public mmg
|
||||||
;; The build doesn't honor -DCMAKE_INSTALL_BINDIR, hence
|
;; The build doesn't honor -DCMAKE_INSTALL_BINDIR, hence
|
||||||
;; the adjust-bindir phase.
|
;; the adjust-bindir phase.
|
||||||
;;(string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin")
|
;;(string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin")
|
||||||
|
(string-append "-DCMAKE_INSTALL_MANDIR=" #$output "/share/man")
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
|
"-DBUILD_DOC=ON"
|
||||||
"-DBUILD_TESTING=ON"
|
"-DBUILD_TESTING=ON"
|
||||||
;; The longer tests are for continuous integration and
|
;; The longer tests are for continuous integration and
|
||||||
;; depend on input data which must be downloaded.
|
;; depend on input data which must be downloaded.
|
||||||
"-DONLY_VERY_SHORT_TESTS=ON"
|
"-DONLY_VERY_SHORT_TESTS=ON"
|
||||||
|
"-DUSE_SCOTCH=ON"
|
||||||
;; TODO: Add Elas (from
|
;; TODO: Add Elas (from
|
||||||
;; https://github.com/ISCDtoolbox/LinearElasticity).
|
;; https://github.com/ISCDtoolbox/LinearElasticity).
|
||||||
"-DUSE_ELAS=OFF"
|
"-DUSE_ELAS=OFF"
|
||||||
|
@ -2443,9 +2446,6 @@ (define-public mmg
|
||||||
(invoke "make" "doc")))
|
(invoke "make" "doc")))
|
||||||
(add-after 'install 'install-doc
|
(add-after 'install 'install-doc
|
||||||
(lambda _
|
(lambda _
|
||||||
(copy-recursively
|
|
||||||
"../source/doc/man" (string-append #$output
|
|
||||||
"/share/man/man1"))
|
|
||||||
(copy-recursively
|
(copy-recursively
|
||||||
"doc" (string-append #$output:doc "/share/doc/"
|
"doc" (string-append #$output:doc "/share/doc/"
|
||||||
#$name "-" #$version))))
|
#$name "-" #$version))))
|
||||||
|
|
Loading…
Reference in a new issue