guix-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Ludovic Courtès
Date: Tue, 9 May 2023 10:28:16 -0400 (EDT)

branch: master
commit 5543971899c489fbb1e8a18556b2e19d98a9c136
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue May 9 09:55:09 2023 +0200

    build: Require Guile 3.0.
    
    * configure.ac: Require Guile 3.0.
    * src/cuirass/base.scm <top level>: Remove 'cond-expand' form.
---
 configure.ac         | 3 +--
 src/cuirass/base.scm | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index af294c1..29e8a4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,8 +35,7 @@ AC_CANONICAL_HOST
 AC_PROG_MKDIR_P
 AC_PROG_SED
 
-# We need Fibers, which requires 2.2+.
-GUILE_PKG([3.0 2.2])
+GUILE_PKG([3.0])
 
 AC_PATH_PROG([GUILE], [guile])
 AC_PATH_PROG([GUILD], [guild])
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 4b5e7f7..4fb0e6c 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -108,13 +108,6 @@
      exp ...
      (close-connection store))))
 
-(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 %build-remote?
   ;; Define whether to use the remote build mechanism.
   (make-parameter #f))



reply via email to

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