diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-30 14:18:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-30 17:06:42 +0200 |
| commit | 61f34ae5bbbb492254a3e618548d7019c3b3898f (patch) | |
| tree | 73bf74797923ac18f4bd794e8569c8f372975463 /gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch | |
| parent | 25280065814aecd7ce56baf4866b0c05acf8028b (diff) | |
| download | guix-61f34ae5bbbb492254a3e618548d7019c3b3898f.tar.gz | |
gnu: libssh2: Update to 1.9.0.
* gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/ssh.scm (libssh2): Update to 1.9.0. [source](patches): Remove.
Diffstat (limited to 'gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch')
| -rw-r--r-- | gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch b/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch deleted file mode 100644 index 4133be7fc9..0000000000 --- a/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -This fixes a regression introduced in 1.8.0 where libssh2 fails to build -with the gcrypt backend. - -Upstream bug URL: - -https://github.com/libssh2/libssh2/issues/150 - -Patch copied from upstream source repository: - -https://github.com/libssh2/libssh2/commit/ced924b78a40126606797ef57a74066eb3b4b83f - -From ced924b78a40126606797ef57a74066eb3b4b83f Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <siarheit@google.com> -Date: Mon, 31 Oct 2016 09:04:33 +0000 -Subject: [PATCH] acinclude.m4: fix ./configure --with-libgcrypt - -diff --git a/acinclude.m4 b/acinclude.m4 -index 734ef07..c78260c 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" -- CFLAGS="$CFLAGS -I$use_libgcrypt/include" -+ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then -+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib" -+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include" - fi - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ - #include <gcrypt.h> |