From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVCkh-00080f-Tw for guix-patches@gnu.org; Wed, 12 Jul 2017 04:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVCkc-0001AG-UM for guix-patches@gnu.org; Wed, 12 Jul 2017 04:12:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60234) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVCkc-0001AC-RS for guix-patches@gnu.org; Wed, 12 Jul 2017 04:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dVCkc-0005lj-Jd for guix-patches@gnu.org; Wed, 12 Jul 2017 04:12:02 -0400 Subject: [bug#27662] [PATCH] base: Fix time-monotonic Guile issue. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVCk2-0007wK-4E for guix-patches@gnu.org; Wed, 12 Jul 2017 04:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVCjx-0000VY-4y for guix-patches@gnu.org; Wed, 12 Jul 2017 04:11:26 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:33801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVCjw-0000Uj-Uq for guix-patches@gnu.org; Wed, 12 Jul 2017 04:11:21 -0400 Received: by mail-wr0-x22f.google.com with SMTP id 77so22753392wrb.1 for ; Wed, 12 Jul 2017 01:11:20 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 12 Jul 2017 10:11:12 +0200 Message-Id: <20170712081112.22783-2-m.othacehe@gmail.com> In-Reply-To: <20170712081112.22783-1-m.othacehe@gmail.com> References: <20170712081112.22783-1-m.othacehe@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27662@debbugs.gnu.org * src/cuirass/base.scm: Replace time-monotonic with time-tai with Guile 2.2, to avoid wrong evaluation durations. --- src/cuirass/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index 5e0cb0d..d0e77d9 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -45,6 +45,13 @@ %package-cachedir %use-substitutes?)) +(cond-expand + (guile-2.2 + ;; Guile 2.2.2 has a bug whereby 'time-monotonic' objects have seconds and + ;; nanoseconds swapped (fixed in Guile commit 886ac3e). Work around it. + (define time-monotonic time-tai)) + (else #t)) + (define %use-substitutes? ;; Define whether to use substitutes (make-parameter #f)) -- 2.13.1