guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

24/36: gnu: ocaml-findlib: Return #t from all phases.


From: Mark H. Weaver
Subject: 24/36: gnu: ocaml-findlib: Return #t from all phases.
Date: Thu, 12 Apr 2018 04:09:21 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 4a810e75aa5b67c38471ff20f7b4b7124d04449c
Author: Mark H Weaver <address@hidden>
Date:   Thu Apr 12 03:34:53 2018 -0400

    gnu: ocaml-findlib: Return #t from all phases.
    
    * gnu/packages/ocaml.scm (ocaml-findlib)[arguments]: Use invoke instead of
    system*, and return #t from all phases.
---
 gnu/packages/ocaml.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index da98df5..0f5fa0f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -876,7 +876,7 @@ to the other.")
                    'configure
                    (lambda* (#:key inputs outputs #:allow-other-keys)
                      (let ((out (assoc-ref outputs "out")))
-                       (system*
+                       (invoke
                         "./configure"
                         "-bindir" (string-append out "/bin")
                         "-config" (string-append out "/etc/ocamfind.conf")
@@ -886,14 +886,15 @@ to the other.")
                   (replace 'install
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((out (assoc-ref outputs "out")))
-                        (zero? (system* "make" "install"
-                                        (string-append "OCAML_CORE_STDLIB="
-                                                       out 
"/lib/ocaml/site-lib"))))))
+                        (invoke "make" "install"
+                                (string-append "OCAML_CORE_STDLIB="
+                                               out "/lib/ocaml/site-lib")))))
                   (add-after 'install 'remove-camlp4
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((out (assoc-ref outputs "out")))
                         (delete-file-recursively
-                          (string-append out 
"/lib/ocaml/site-lib/camlp4"))))))))
+                         (string-append out "/lib/ocaml/site-lib/camlp4"))
+                        #t))))))
     (home-page "http://projects.camlcity.org/projects/findlib.html";)
     (synopsis "Management tool for OCaml libraries")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]