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

gnu: libfive: Add snippet, enable tests and remove obsolete phase. 

* gnu/packages/engineering.scm (libfive)[source]: Add snippet to
remove bundled catch.
[arguments]: Remove #:tests?.  Add #:test-target.  Remove phase
'add-eigen-to-search-path'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Diego Nicola Barbato 2018-04-06 13:43:54 +02:00 committed by Ludovic Courtès
parent 541dac8aee
commit 0818c01aef
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/engineering.scm
View File

@ -580,24 +580,19 @@ as well as pick-place files.")
(sha256 (sha256
(base32 (base32
"1r40kyx30wz31cwwlfvfh7fgqkxq3n8dxhswpi9qpf4r5h3l8wsn")) "1r40kyx30wz31cwwlfvfh7fgqkxq3n8dxhswpi9qpf4r5h3l8wsn"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))
(snippet
;; Remove bundled catch since we provide our own.
'(delete-file "libfive/test/catch.hpp"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no "test" target `(#:test-target "libfive-test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'remove-native-compilation (add-after 'unpack 'remove-native-compilation
(lambda _ (lambda _
(substitute* "CMakeLists.txt" (("-march=native") "")) (substitute* "CMakeLists.txt" (("-march=native") ""))
#t)) #t)))))
(add-before 'build 'add-eigen-to-search-path
(lambda* (#:key inputs #:allow-other-keys)
;; Allow things to find our own Eigen and Catch.
(let ((eigen (assoc-ref inputs "eigen")))
(setenv "CPLUS_INCLUDE_PATH"
(string-append eigen "/include/eigen3:"
(getenv "CPLUS_INCLUDE_PATH")))
#t))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs