Hi,

Le 29/12/2014 22:26, Romain Naour a écrit :
> 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.na...@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\
> 

Too bad, I missed the 4.6.1 release.
Please, consider this patch for the next release.

Thanks.

Best regards,
Romain Naour
_______________________________________________
lftp-devel mailing list
lftp-devel@uniyar.ac.ru
http://univ.uniyar.ac.ru/mailman/listinfo/lftp-devel

Reply via email to