guix-commits
[Top][All Lists]
Advanced

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

44/66: gnu: mozjs: Return #t from all phases.


From: Mark H. Weaver
Subject: 44/66: gnu: mozjs: Return #t from all phases.
Date: Fri, 23 Mar 2018 04:46:46 -0400 (EDT)

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

commit e15793c8d05f6d6d734b8c163c384e84d4606d98
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 23 03:14:23 2018 -0400

    gnu: mozjs: Return #t from all phases.
    
    * gnu/packages/gnuzilla.scm (mozjs)[arguments]: Return #t from the
    'delete-timedout-test' phase.  Use 'invoke' in the configure phase.
---
 gnu/packages/gnuzilla.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 5a86c11..17a6719 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -98,7 +98,9 @@
        (modify-phases %standard-phases
          (add-after 'unpack 'delete-timedout-test
            ;; This test times out on slower hardware.
-           (lambda _ (delete-file "js/src/jit-test/tests/basic/bug698584.js")))
+           (lambda _
+             (delete-file "js/src/jit-test/tests/basic/bug698584.js")
+             #t))
          (add-before 'configure 'chdir
            (lambda _
              (chdir "js/src")
@@ -109,12 +111,11 @@
              (let ((out (assoc-ref outputs "out")))
                (setenv "SHELL" (which "sh"))
                (setenv "CONFIG_SHELL" (which "sh"))
-               (zero? (system*
-                       "./configure" (string-append "--prefix=" out)
-                                     ,@(if (string=? "aarch64-linux"
-                                                     (%current-system))
-                                         '("--host=aarch64-unknown-linux-gnu")
-                                         '())))))))))
+               (invoke "./configure" (string-append "--prefix=" out)
+                       ,@(if (string=? "aarch64-linux"
+                                       (%current-system))
+                             '("--host=aarch64-unknown-linux-gnu")
+                             '()))))))))
     (home-page
      "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";)
     (synopsis "Mozilla javascript engine")



reply via email to

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