[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/23: gnu: scm: Return #t from phases.
From: |
Tobias Geerinckx-Rice |
Subject: |
13/23: gnu: scm: Return #t from phases. |
Date: |
Wed, 27 Jun 2018 07:01:51 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit b44b14cd85b2962bc3062c6da59a83deacb0de13
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Jun 26 17:42:41 2018 +0200
gnu: scm: Return #t from phases.
* gnu/packages/scheme.scm (scm)[arguments]: Substitute INVOKE for
SYSTEM*. Return #t rather than undefined from phases.
---
gnu/packages/scheme.scm | 39 +++++++++++++++++----------------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index db39632..4178a45 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -917,39 +917,34 @@ utility functions for all standard Scheme
implementations.")
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
- (zero? (system* "./configure"
- (string-append "--prefix="
- (assoc-ref outputs
"out"))))))
+ (invoke "./configure"
+ (string-append "--prefix="
+ (assoc-ref outputs "out")))))
(add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile"
- (("ginstall-info") "install-info"))))
+ (("ginstall-info") "install-info"))
+ #t))
(replace 'build
(lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "SCHEME_LIBRARY_PATH"
(string-append (assoc-ref inputs "slib")
"/lib/slib/"))
- (and
- (zero? (system* "make" "scmlit" "CC=gcc"))
- (zero? (system* "make" "all")))))
+ (invoke "make" "scmlit" "CC=gcc")
+ (invoke "make" "all")))
(add-after 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((req
- (string-append (assoc-ref outputs "out")
- "/lib/scm/require.scm")))
- (and
- (delete-file req)
- (format (open req (logior O_WRONLY O_CREAT))
- "(define (library-vicinity) ~s)\n"
- (string-append (assoc-ref inputs "slib")
- "/lib/slib/"))
+ (let* ((out (assoc-ref outputs "out"))
+ (req (string-append out "/lib/scm/require.scm")))
+ (delete-file req)
+ (format (open req (logior O_WRONLY O_CREAT))
+ "(define (library-vicinity) ~s)\n"
+ (string-append (assoc-ref inputs "slib")
+ "/lib/slib/"))
- ;; We must generate the slibcat file
- (zero? (system*
- (string-append
- (assoc-ref outputs "out")
- "/bin/scm")
- "-br" "new-catalog")))))))))
+ ;; We must generate the slibcat file.
+ (invoke (string-append out "/bin/scm")
+ "-br" "new-catalog")))))))
(inputs `(("slib" ,slib)))
(native-inputs `(("unzip" ,unzip)
("texinfo" ,texinfo)))
- 20/23: gnu: ghmm: Return #t from all phases., (continued)
- 20/23: gnu: ghmm: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/27
- 18/23: gnu: papagayo: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/27
- 12/23: gnu: slib: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/27
- 09/23: gnu: squeak-vm: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/27
- 22/23: gnu: dlib: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/27
- 07/23: gnu: aegis: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/27
- 08/23: gnu: java-jgit: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/27
- 04/23: gnu: cgit: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/27
- 14/23: gnu: python-patsy: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/27
- 23/23: gnu: python-scikit-learn: Return #t from phases., Tobias Geerinckx-Rice, 2018/06/27
- 13/23: gnu: scm: Return #t from phases.,
Tobias Geerinckx-Rice <=
- 16/23: gnu: cifs-utils: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/27
- 11/23: gnu: scmutils: Return #t from all phases., Tobias Geerinckx-Rice, 2018/06/27