diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-26 20:12:18 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-26 22:05:42 +0100 |
| commit | ac2d5de3dae5a1854f27e1a0b4c09f71001cb91a (patch) | |
| tree | ef78437f60eec836a4ec47989608344d5d1c3966 /gnu/packages/ssh.scm | |
| parent | 56a44e2d5b16ff9b54468f0f48d8fa679b8163ed (diff) | |
| download | guix-ac2d5de3dae5a1854f27e1a0b4c09f71001cb91a.tar guix-ac2d5de3dae5a1854f27e1a0b4c09f71001cb91a.tar.gz | |
gnu: libssh2: Fix build failure after 1.8.0 upgrade.
* gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ssh.scm (libssh2)[source]: Use it.
[arguments]: Add 'autoreconf' phase.
[native-inputs]: Add AUTOCONF and AUTOMAKE.
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c48e3e6f90..2e502fe7fc 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -93,13 +93,21 @@ remote applications.") version ".tar.gz")) (sha256 (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")))) + "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) + (patches + (search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))) (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. (propagated-inputs `(("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) - (arguments '(#:configure-flags `("--with-libgcrypt"))) + (arguments '(#:configure-flags `("--with-libgcrypt") + #:phases (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-v"))))))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake))) (synopsis "Client-side C library implementing the SSH2 protocol") (description "libssh2 is a library intended to allow software developers access to |