[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: build: Prefer Guile 2.2 over 2.0.
From: |
Ludovic Courtès |
Subject: |
06/06: build: Prefer Guile 2.2 over 2.0. |
Date: |
Wed, 15 Mar 2017 10:26:24 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 608e42e7c92114497e7908980424288079acee1e
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 15 15:18:39 2017 +0100
build: Prefer Guile 2.2 over 2.0.
* configure.ac: In 'GUILE_PKG', prefer 2.2 over 2.0. Remove warning
about 2.2 not being fully supported.
* doc/guix.texi (Requirements): Mention Guile 2.2.x.
---
configure.ac | 8 +++-----
doc/guix.texi | 3 ++-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index e5daadb..3bf2bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,9 +73,9 @@ m4_pattern_forbid([PKG_CHECK_MODULES])
m4_pattern_forbid([GUILE_MODULE_AVAILABLE])
m4_pattern_forbid([^GUILE_P$])
-dnl Search for 'guile' and 'guild'. Prefer 2.0 until the 2.2 upgrade is
-dnl complete. This macro defines 'GUILE_EFFECTIVE_VERSION'.
-GUILE_PKG([2.0 2.2])
+dnl Search for 'guile' and 'guild'. This macro defines
+dnl 'GUILE_EFFECTIVE_VERSION'.
+GUILE_PKG([2.2 2.0])
GUILE_PROGS
if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x
installation.])
@@ -83,8 +83,6 @@ fi
if test "x$GUILE_EFFECTIVE_VERSION" = "x2.0"; then
PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7])
-else
- AC_MSG_WARN([Guile $GUILE_EFFECTIVE_VERSION is not fully supported!])
fi
dnl Installation directory for .scm and .go files.
diff --git a/doc/guix.texi b/doc/guix.texi
index 82298e6..78bf03d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -551,7 +551,8 @@ in the Guix source tree for additional details.
GNU Guix depends on the following packages:
@itemize
address@hidden @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.7
or later;
address@hidden @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.7 or
+later, including 2.2.x;
@item @url{http://gnupg.org/, GNU libgcrypt};
@item
@uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings
- branch master updated (bd10215 -> 608e42e), Ludovic Courtès, 2017/03/15
- 02/06: zlib: Don't rely on EBADF being ignored by 'fport_close'., Ludovic Courtès, 2017/03/15
- 04/06: store: Adjust UTF-8 test to Guile 2.2., Ludovic Courtès, 2017/03/15
- 06/06: build: Prefer Guile 2.2 over 2.0.,
Ludovic Courtès <=
- 05/06: tests: Expect less accurate location info in 2.2.0., Ludovic Courtès, 2017/03/15
- 03/06: syscalls: Adjust 'clone' to Guile 2.2., Ludovic Courtès, 2017/03/15
- 01/06: maint: Mention address@hidden in 'HACKING'., Ludovic Courtès, 2017/03/15