mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
package/lftp: bump to version 4.9.1
- Remove first patch and use --with-readline-lib as a slightly updated
version of this patch has been merged with:
af9fde5f93
- Remove autoreconf as it does not seem needed anymore
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
parent
b920ac0a90
commit
9b7936fab6
@ -1,40 +0,0 @@
|
|||||||
fix static link with readline
|
|
||||||
|
|
||||||
When readline is static library, we need to link against ncurses
|
|
||||||
because readline needs ncurses. It is because, dependent library's
|
|
||||||
symbols are not resolved when static library is built. Those symbols
|
|
||||||
are resolved program tries to link with static library.
|
|
||||||
|
|
||||||
We can't pass linker flags for ncurses by setting LIBS environment
|
|
||||||
variable via <PKG>_CONF_ENV because it looks like build system is not
|
|
||||||
taking that into account and even though it would have been, order of
|
|
||||||
linking is important.
|
|
||||||
|
|
||||||
We can't also pass linker flags for ncurses via --with-readline-libs
|
|
||||||
conf options because it causes lftp_LIB_READLINE macro to take readline
|
|
||||||
headers from host machine if available. To use --with-readline-libs
|
|
||||||
we need to set --with-readline=yes and --with-readline-inc to include
|
|
||||||
dir. But when --with-readline=yes, readline_prefix is computed based
|
|
||||||
on if headers can be found in /usr/local or /usr. If readline is
|
|
||||||
installed on host machine, then configure fails since we are using
|
|
||||||
headers for host machine. If headers are not found in /usr/local or /usr
|
|
||||||
then only path specified --with-readline-inc is taken into account.
|
|
||||||
So specifying linker flags for ncurses via --with-readline-libs will
|
|
||||||
not work in all cases.
|
|
||||||
|
|
||||||
So it looks like, updating linker flags directly is only option to fix
|
|
||||||
static link issue against readline.
|
|
||||||
|
|
||||||
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
|
||||||
|
|
||||||
--- lftp-4.7.3/m4/lftp_lib_readline.m4.old 2016-08-08 19:49:12.217596470 +0530
|
|
||||||
+++ lftp-4.7.3/m4/lftp_lib_readline.m4 2016-08-08 19:49:46.265596398 +0530
|
|
||||||
@@ -108,7 +108,7 @@ AC_DEFUN([lftp_LIB_READLINE],
|
|
||||||
readline_include_dir="$readline_include_dir/readline"
|
|
||||||
fi
|
|
||||||
readline_ld_flags="-L$readline_prefix/lib"
|
|
||||||
- readline_lib_flags="-lreadline"
|
|
||||||
+ readline_lib_flags="-lreadline -lncurses"
|
|
||||||
run_readline_test="yes"
|
|
||||||
elif test "$readline_requested" = "yes"; then
|
|
||||||
if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then
|
|
@ -1,7 +1,7 @@
|
|||||||
# From http://lftp.yar.ru/ftp/lftp-4.9.0.md5sum
|
# From http://lftp.yar.ru/ftp/lftp-4.9.1.md5sum
|
||||||
md5 6e3268506895a446a6c83b6387534070 lftp-4.9.0.tar.xz
|
md5 3da57b1960b1416e89a532c54a67a936 lftp-4.9.1.tar.xz
|
||||||
# Locally calculated after checking gpg signature
|
# Locally calculated after checking gpg signature
|
||||||
sha256 0b3b659e1969a31827a25861c01ccf71ac6d3f20ee256bdf6999d653e031a24e lftp-4.9.0.tar.xz
|
sha256 5969fcaefd102955dd882f3bcd8962198bc537224749ed92f206f415207a024b lftp-4.9.1.tar.xz
|
||||||
|
|
||||||
# Hash for license file:
|
# Hash for license file:
|
||||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||||
|
@ -4,19 +4,17 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LFTP_VERSION = 4.9.0
|
LFTP_VERSION = 4.9.1
|
||||||
LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
|
LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
|
||||||
LFTP_SITE = http://lftp.yar.ru/ftp
|
LFTP_SITE = http://lftp.yar.ru/ftp
|
||||||
LFTP_LICENSE = GPL-3.0+
|
LFTP_LICENSE = GPL-3.0+
|
||||||
LFTP_LICENSE_FILES = COPYING
|
LFTP_LICENSE_FILES = COPYING
|
||||||
# Needed so that our libtool patch applies properly, and for patch
|
|
||||||
# 0001-fix-static-link-with-readline.patch.
|
|
||||||
LFTP_AUTORECONF = YES
|
|
||||||
LFTP_DEPENDENCIES = readline zlib host-pkgconf
|
LFTP_DEPENDENCIES = readline zlib host-pkgconf
|
||||||
|
|
||||||
# Help lftp finding readline and zlib
|
# Help lftp finding readline and zlib
|
||||||
LFTP_CONF_OPTS = \
|
LFTP_CONF_OPTS = \
|
||||||
--with-readline=$(STAGING_DIR)/usr \
|
--with-readline=$(STAGING_DIR)/usr \
|
||||||
|
--with-readline-lib="`$(PKG_CONFIG_HOST_BINARY) --libs readline`" \
|
||||||
--with-zlib=$(STAGING_DIR)/usr
|
--with-zlib=$(STAGING_DIR)/usr
|
||||||
|
|
||||||
ifneq ($(BR2_STATIC_LIBS),y)
|
ifneq ($(BR2_STATIC_LIBS),y)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user