Merge pull request #955 from lrusak/lftp

lftp: update to 4.7.4

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="lftp"
-PKG_VERSION="4.6.5"
+PKG_VERSION="4.7.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -29,13 +29,11 @@ PKG_SHORTDESC="ftp client"
 PKG_LONGDESC="LFTP is a sophisticated ftp/http client, and a file transfer program supporting a number of network protocols"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-nls --with-gnu-ld --without-gnutls --with-openssl"
+PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
+                           --without-gnutls \
+                           --with-openssl \
+                           --with-readline=$SYSROOT_PREFIX/usr"
 
 makeinstall_target() {
   : # nop
 }
-
-pre_configure_target() {
-  # fails to build with gcc 4.9 + lto
-  strip_lto
-}

packages/addons/addon-depends/network-tools-depends/lftp/patches/lftp-0001-link-readline-with-termcap.patch

@@ -0,0 +1,12 @@
+diff -Naur a/configure b/configure
+--- a/configure	2016-11-16 05:11:30.000000000 -0800
++++ b/configure	2016-11-19 11:21:25.384243165 -0800
+@@ -48854,7 +48854,7 @@
+ 	    readline_include_dir="$readline_include_dir/readline"
+ 	fi
+         readline_ld_flags="-L$readline_prefix/lib"
+-        readline_lib_flags="-lreadline"
++        readline_lib_flags="-lreadline -ltermcap"
+         run_readline_test="yes"
+     elif test "$readline_requested" = "yes"; then
+         if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then