[Astlinux-commits] SF.net SVN: astlinux:[8014] branches/1.0/package/openssh/openssh.mk

[<abe...@us...>]

Revision: 8014
          http://sourceforge.net/p/astlinux/code/8014
Author:   abelbeck
Date:     2016-12-05 14:16:36 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
openssh, enable libedit support which sftp uses for command history and tab completion

Modified Paths:
--------------
    branches/1.0/package/openssh/openssh.mk

Modified: branches/1.0/package/openssh/openssh.mk
===================================================================
--- branches/1.0/package/openssh/openssh.mk	2016-12-05 04:26:18 UTC (rev 8013)
+++ branches/1.0/package/openssh/openssh.mk	2016-12-05 14:16:36 UTC (rev 8014)
@@ -7,12 +7,24 @@
 OPENSSH_VERSION = 6.6p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPT = --libexecdir=/usr/libexec --disable-lastlog --disable-utmp \
-		--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip \
-		--sysconfdir=/etc/ssh
 
 OPENSSH_DEPENDENCIES = zlib openssl
 
+OPENSSH_CONF_OPT = \
+	--libexecdir=/usr/libexec \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--disable-strip \
+	--sysconfdir=/etc/ssh
+
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+OPENSSH_DEPENDENCIES += libedit
+OPENSSH_CONF_OPT += --with-libedit="$(STAGING_DIR)/usr"
+endif
+
 OPENSSH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) -C $(@D) install-nosysconf
 
 define OPENSSH_INSTALL_INITSCRIPT

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.