me
/
guix
Archived
1
0
Fork 0
Code

build: Depend on guile-ssh 0.12.0 

This is a followup to 35f3511167.

* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Check for userauth-gssapi!
* doc/guix.texi: Document version requirement

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Lars-Dominik Braun 2020-02-20 12:36:10 +01:00 committed by Ludovic Courtès
parent 43e282accc
commit 3789187252
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -772,11 +772,11 @@ The following dependencies are optional:
@itemize @itemize
@item @item
@c Note: We need at least 0.10.2 for 'channel-send-eof'. @c Note: We need at least 0.12.0 for 'userauth-gssapi!'.
Support for build offloading (@pxref{Daemon Offload Setup}) and Support for build offloading (@pxref{Daemon Offload Setup}) and
@command{guix copy} (@pxref{Invoking guix copy}) depends on @command{guix copy} (@pxref{Invoking guix copy}) depends on
@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH},
version 0.10.2 or later. version 0.12.0 or later.
@item @item
When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib When @url{https://www.nongnu.org/lzip/lzlib.html, lzlib} is available, lzlib

5
m4/guix.m4
View File

@ -142,13 +142,14 @@ dnl GUIX_CHECK_GUILE_SSH
dnl dnl
dnl Check whether a recent-enough Guile-SSH is available. dnl Check whether a recent-enough Guile-SSH is available.
AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ AC_DEFUN([GUIX_CHECK_GUILE_SSH], [
dnl Check whether 'channel-send-eof' (introduced in 0.10.2) is present. dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present.
AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], AC_CACHE_CHECK([whether Guile-SSH is available and recent enough],
[guix_cv_have_recent_guile_ssh], [guix_cv_have_recent_guile_ssh],
[GUILE_CHECK([retval], [GUILE_CHECK([retval],
[(and (@ (ssh channel) channel-send-eof) [(and (@ (ssh channel) channel-send-eof)
(@ (ssh popen) open-remote-pipe) (@ (ssh popen) open-remote-pipe)
(@ (ssh dist node) node-eval))]) (@ (ssh dist node) node-eval)
(@ (ssh auth) userauth-gssapi!))])
if test "$retval" = 0; then if test "$retval" = 0; then
guix_cv_have_recent_guile_ssh="yes" guix_cv_have_recent_guile_ssh="yes"
else else