guix-commits
[Top][All Lists]
Advanced

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

23/36: gnu: camlp5: Return #t from all phases.


From: Mark H. Weaver
Subject: 23/36: gnu: camlp5: 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 402dedf883ff07763db179bea08e4809bc43847c
Author: Mark H Weaver <address@hidden>
Date:   Thu Apr 12 03:33:26 2018 -0400

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

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 4809aa0..da98df5 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -399,19 +399,20 @@ syntax of OCaml.")
                            (mandir (string-append out "/share/man")))
                       ;; Custom configure script doesn't recognize
                       ;; --prefix=<PREFIX> syntax (with equals sign).
-                      (zero? (system* "./configure"
-                                      "--prefix" out
-                                      "--mandir" mandir)))))
+                      (invoke "./configure"
+                              "--prefix" out
+                              "--mandir" mandir))))
          (replace 'build
                   (lambda _
-                    (zero? (system* "make" "-j" (number->string
-                                                 (parallel-job-count))
-                                    "world.opt"))))
+                    (invoke "make" "-j" (number->string
+                                         (parallel-job-count))
+                            "world.opt")))
          ;; Required for findlib to find camlp5's libraries
          (add-after 'install 'install-meta
            (lambda* (#:key outputs #:allow-other-keys)
              (install-file "etc/META" (string-append (assoc-ref outputs "out")
-                                                     
"/lib/ocaml/camlp5/")))))))
+                                                     "/lib/ocaml/camlp5/"))
+             #t)))))
     (home-page "http://camlp5.gforge.inria.fr/";)
     (synopsis "Pre-processor Pretty Printer for OCaml")
     (description



reply via email to

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