mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
TriForceX
@@ -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,57 +0,0 @@
|
||||
Use <cmath> instead of <math.h> to fix gcc 6.x build
|
||||
|
||||
This patch fixes the following build issue:
|
||||
|
||||
../lib/math.h:2577:1: error: ‘int signbit(float)’ conflicts with a previous declaration
|
||||
|
||||
that occurs with gcc 6.x.
|
||||
|
||||
Patch taken from
|
||||
https://raw.githubusercontent.com/openembedded/meta-openembedded/master/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
--- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400
|
||||
+++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <assert.h>
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "NetAccess.h"
|
||||
--- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400
|
||||
+++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
#include <stdlib.h>
|
||||
#include "Speedometer.h"
|
||||
#include "misc.h"
|
||||
--- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400
|
||||
+++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
#include <stddef.h>
|
||||
#include "FileCopy.h"
|
||||
#include "url.h"
|
||||
--- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400
|
||||
+++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <ctype.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
@@ -1,7 +1,7 @@
|
||||
# From http://lftp.yar.ru/ftp/lftp-4.8.4.md5sum
|
||||
md5 b75c43797e817529d486be640232d708 lftp-4.8.4.tar.xz
|
||||
# From http://lftp.yar.ru/ftp/lftp-4.9.2.md5sum
|
||||
md5 b3a272ecb7a2b60e3827776f90ffb2f3 lftp-4.9.2.tar.xz
|
||||
# Locally calculated after checking gpg signature
|
||||
sha256 4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62 lftp-4.8.4.tar.xz
|
||||
sha256 c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d lftp-4.9.2.tar.xz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,19 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LFTP_VERSION = 4.8.4
|
||||
LFTP_VERSION = 4.9.2
|
||||
LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
|
||||
LFTP_SITE = http://lftp.yar.ru/ftp
|
||||
LFTP_LICENSE = GPL-3.0+
|
||||
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
|
||||
|
||||
# Help lftp finding readline and zlib
|
||||
LFTP_CONF_OPTS = \
|
||||
--with-readline=$(STAGING_DIR)/usr \
|
||||
--with-readline-lib="`$(PKG_CONFIG_HOST_BINARY) --libs readline`" \
|
||||
--with-zlib=$(STAGING_DIR)/usr
|
||||
|
||||
ifneq ($(BR2_STATIC_LIBS),y)
|
||||
|
||||
Reference in New Issue
Block a user