nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-03-15 15:18:39 +01:00
parent 13159c68ef
commit 608e42e7c9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -73,9 +73,9 @@ m4_pattern_forbid([PKG_CHECK_MODULES])
m4_pattern_forbid([GUILE_MODULE_AVAILABLE]) m4_pattern_forbid([GUILE_MODULE_AVAILABLE])
m4_pattern_forbid([^GUILE_P$]) m4_pattern_forbid([^GUILE_P$])
dnl Search for 'guile' and 'guild'. Prefer 2.0 until the 2.2 upgrade is dnl Search for 'guile' and 'guild'. This macro defines
dnl complete. This macro defines 'GUILE_EFFECTIVE_VERSION'. dnl 'GUILE_EFFECTIVE_VERSION'.
GUILE_PKG([2.0 2.2]) GUILE_PKG([2.2 2.0])
GUILE_PROGS GUILE_PROGS
if test "x$GUILD" = "x"; then if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) 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 if test "x$GUILE_EFFECTIVE_VERSION" = "x2.0"; then
PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7])
else
AC_MSG_WARN([Guile $GUILE_EFFECTIVE_VERSION is not fully supported!])
fi fi
dnl Installation directory for .scm and .go files. dnl Installation directory for .scm and .go files.

3
doc/guix.texi
View File

@ -551,7 +551,8 @@ in the Guix source tree for additional details.
GNU Guix depends on the following packages: GNU Guix depends on the following packages:
@itemize @itemize
@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.7 or later; @item @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 @url{http://gnupg.org/, GNU libgcrypt};
@item @item
@uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings @uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings