diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:08:31 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:13:17 +0200 |
| commit | 721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch) | |
| tree | 2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/libssh/libssh.mk | |
| parent | 89920e9735cb561dccf1e1f81d35788fd10a655b (diff) | |
| parent | cec266ee1f708f11cc679cb4f81613fa4186003c (diff) | |
| download | buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libssh/libssh.mk')
| -rw-r--r-- | package/libssh/libssh.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 902865d73b..635d72ad98 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSSH_VERSION_MAJOR = 0.7 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5 +LIBSSH_VERSION_MAJOR = 0.8 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 @@ -17,6 +17,9 @@ LIBSSH_CONF_OPTS = \ -DWITH_SERVER=OFF \ -DWITH_EXAMPLES=OFF +# cmake older than 3.10 require this to avoid try_run() in FindThreads +LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON LIBSSH_DEPENDENCIES += zlib |
