Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/lftp: add optional support for expat
@ 2016-02-20 23:27 Bernd Kuhls
  2016-02-21 11:24 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2016-02-20 23:27 UTC (permalink / raw)
  To: buildroot

When expat was compiled before, the proto-http module will use it as
optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/lftp/4.6.4/proto-http.so | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libcrypto.so.1.0.0]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libexpat.so.1]
[...]

The build system offers no option to en-/disable expat support:
https://github.com/lavv17/lftp/blob/lftp-4.6-stable/configure.ac#L337

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lftp/lftp.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk
index d2d58fd..5051f70 100644
--- a/package/lftp/lftp.mk
+++ b/package/lftp/lftp.mk
@@ -17,6 +17,10 @@ ifneq ($(BR2_STATIC_LIBS),y)
 LFTP_CONF_OPTS += --with-modules
 endif
 
+ifeq ($(BR2_PACKAGE_EXPAT)$(BR2_PACKAGE_LFTP_PROTO_HTTP),yy)
+LFTP_DEPENDENCIES += expat
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 LFTP_DEPENDENCIES += gnutls
 LFTP_CONF_OPTS += --with-gnutls
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH 1/1] package/lftp: add optional support for expat
  2016-02-20 23:27 [Buildroot] [PATCH 1/1] package/lftp: add optional support for expat Bernd Kuhls
@ 2016-02-21 11:24 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2016-02-21 11:24 UTC (permalink / raw)
  To: buildroot

Dear Bernd Kuhls,

On Sun, 21 Feb 2016 00:27:31 +0100, Bernd Kuhls wrote:
> When expat was compiled before, the proto-http module will use it as
> optional dependency:
> 
> $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/lftp/4.6.4/proto-http.so | grep NEEDED | sort
>  0x0000000000000001 (NEEDED)             Shared library: [libcrypto.so.1.0.0]
>  0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
>  0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
>  0x0000000000000001 (NEEDED)             Shared library: [libexpat.so.1]
> [...]
> 
> The build system offers no option to en-/disable expat support:
> https://github.com/lavv17/lftp/blob/lftp-4.6-stable/configure.ac#L337
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/lftp/lftp.mk | 4 ++++
>  1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-02-21 11:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-20 23:27 [Buildroot] [PATCH 1/1] package/lftp: add optional support for expat Bernd Kuhls
2016-02-21 11:24 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox