aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Romain Naour <romain.naour@openwide.fr>2014-12-27 21:34:26 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-27 21:55:45 +0100
commit110605f2c8c2517816d35c184a3e83e4dbd02b4a (patch)
tree4162d2fca1762771ba872a5ad21d565e05b27170
parent94841d87fd2ff8ebf7af84d49e5095074958febf (diff)
downloadbuildroot-110605f2c8c2517816d35c184a3e83e4dbd02b4a.tar.gz
buildroot-110605f2c8c2517816d35c184a3e83e4dbd02b4a.tar.bz2
package/lftp: don't use host's path
lftp try to link with -L/usr/lib/lftp/$(LFTP_VERSION) if DESTDIR is not set. Remove useless -L option which point to a location where no libraries are installed. Signed-off-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/lftp/0001-Remove-unused-libraries-path.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/package/lftp/0001-Remove-unused-libraries-path.patch b/package/lftp/0001-Remove-unused-libraries-path.patch
new file mode 100644
index 0000000000..3521ec80ec
--- /dev/null
+++ b/package/lftp/0001-Remove-unused-libraries-path.patch
@@ -0,0 +1,46 @@
+From 30e575f18416d67732be1e0350ee727b72b2d225 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Sat, 27 Dec 2014 20:56:56 +0100
+Subject: [PATCH] Remove unused libraries path
+
+When building proto modules the path to library files is
+specified with -L$(DESTDIR)$(pkgverlibdir) which point to
+directory that doesn't exist.
+
+Also, when cross-compiling and $(DESTDIR) is empty,
+$(pkgverlibdir) contains a path to the host libraries
+(/usr/lib/lftp/4.5.5) which is considered unsafe.
+
+Anyway, those -L are not needed: by the time where
+proto modules gets built/linked, no libraries are
+installed in this location.
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ src/Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d715d0a..0e221cf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -59,11 +59,11 @@ liblftp_pty_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir)
+ liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(OPENSSL_LDFLAGS)
+ liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB)
+
+-proto_ftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la
+-proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la $(EXPAT_LIBS) $(ZLIB)
+-proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la
+-proto_sftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la
+-cmd_torrent_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la
++proto_ftp_la_LIBADD = liblftp-network.la
++proto_http_la_LIBADD = liblftp-network.la $(EXPAT_LIBS) $(ZLIB)
++proto_fish_la_LIBADD = liblftp-network.la liblftp-pty.la
++proto_sftp_la_LIBADD = liblftp-network.la liblftp-pty.la
++cmd_torrent_la_LIBADD = liblftp-network.la
+
+ liblftp_tasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\
+ ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\
+--
+1.9.3
+