[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: gnu: libfive: Add snippet, enable tests and remove obsolete phase
From: |
Ludovic Courtès |
Subject: |
03/07: gnu: libfive: Add snippet, enable tests and remove obsolete phase. |
Date: |
Thu, 19 Apr 2018 05:59:04 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 0818c01aefbaa7ecce5e310ec5f70886850a7f9c
Author: Diego Nicola Barbato <address@hidden>
Date: Fri Apr 6 13:43:54 2018 +0200
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 <address@hidden>
---
gnu/packages/engineering.scm | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 1113caf..2f4e8ce 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -580,24 +580,19 @@ as well as pick-place files.")
(sha256
(base32
"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)
(arguments
- `(#:tests? #f ; no "test" target
+ `(#:test-target "libfive-test"
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-native-compilation
(lambda _
(substitute* "CMakeLists.txt" (("-march=native") ""))
- #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))))))
+ #t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- branch master updated (67a51b6 -> b164233), Ludovic Courtès, 2018/04/19
- 02/07: gnu: Add spindle., Ludovic Courtès, 2018/04/19
- 01/07: gnu: Add launchmon., Ludovic Courtès, 2018/04/19
- 03/07: gnu: libfive: Add snippet, enable tests and remove obsolete phase.,
Ludovic Courtès <=
- 05/07: gnu: Add perl-io-all., Ludovic Courtès, 2018/04/19
- 04/07: gnu: Add perl-file-readbackwards., Ludovic Courtès, 2018/04/19
- 07/07: gnu: Add fortune-mod., Ludovic Courtès, 2018/04/19
- 06/07: gnu: Add perl-test-runvalgrind, Ludovic Courtès, 2018/04/19