[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: gnu: lpsolve: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
08/08: gnu: lpsolve: Update phase style. |
Date: |
Wed, 21 Feb 2018 09:03:11 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 6c96b5452cd72309d12f2d1a3bb4528a365635f6
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Wed Feb 21 05:15:55 2018 +0100
gnu: lpsolve: Update phase style.
* gnu/packages/maths.scm (lpsolve)[arguments]: Use INVOKE and
INSTALL-FILE, and end phases with #t.
---
gnu/packages/maths.scm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 0f87346..bc71473 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3073,16 +3073,17 @@ specifications.")
(("isnan\\(0\\)") "isnan(0.)")))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no check target
+ `(#:tests? #f ; no check target
#:phases
(modify-phases %standard-phases
- (delete 'configure)
+ (delete 'configure) ; no configure script
(replace 'build
(lambda _
- (and (with-directory-excursion "lpsolve55"
- (zero? (system* "bash" "ccc")))
- (with-directory-excursion "lp_solve"
- (zero? (system* "bash" "ccc"))))))
+ (with-directory-excursion "lpsolve55"
+ (invoke "bash" "ccc"))
+ (with-directory-excursion "lp_solve"
+ (invoke "bash" "ccc"))
+ #t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -3091,11 +3092,8 @@ specifications.")
;; This is where LibreOffice expects to find the header
;; files, and where they are installed by Debian.
(include (string-append out "/include/lpsolve")))
- (mkdir-p lib)
- (copy-file "lpsolve55/bin/ux64/liblpsolve55.a"
- (string-append lib "/liblpsolve55.a"))
- (copy-file "lpsolve55/bin/ux64/liblpsolve55.so"
- (string-append lib "/liblpsolve55.so"))
+ (install-file "lpsolve55/bin/ux64/liblpsolve55.a" lib)
+ (install-file "lpsolve55/bin/ux64/liblpsolve55.so" lib)
(install-file "lp_solve/bin/ux64/lp_solve" bin)
;; Install a subset of the header files as on Debian
- branch master updated (781d721 -> 6c96b54), Tobias Geerinckx-Rice, 2018/02/21
- 03/08: gnu: slang: Update to 2.3.1a., Tobias Geerinckx-Rice, 2018/02/21
- 01/08: gnu: getmail: Update to 5.5., Tobias Geerinckx-Rice, 2018/02/21
- 05/08: gnu: lout: Update phase style., Tobias Geerinckx-Rice, 2018/02/21
- 08/08: gnu: lpsolve: Update phase style.,
Tobias Geerinckx-Rice <=
- 06/08: gnu: iptables: Update to 1.6.2., Tobias Geerinckx-Rice, 2018/02/21
- 07/08: gnu: iptables: Edit synopsis & description., Tobias Geerinckx-Rice, 2018/02/21
- 02/08: gnu: shflags: Set source file name., Tobias Geerinckx-Rice, 2018/02/21
- 04/08: gnu: cook: Update phase style., Tobias Geerinckx-Rice, 2018/02/21