diff mbox

atftp: fix static linking

Message ID 1404997647-12843-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Commit 7c84418e414b1c1645cd7c677e98649827daf9b1
Headers show

Commit Message

Gustavo Zacarias July 10, 2014, 1:07 p.m. UTC
Openssl uses libz hence pull it in, also needs to explicitly link
against libpthread. Fixes:
http://autobuild.buildroot.net/results/259/2592612be38a2c1dde21b44be2ecf25d1cc5211a/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/atftp/atftp.mk | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Baruch Siach July 10, 2014, 1:52 p.m. UTC | #1
Hi Gustavo,

On Thu, Jul 10, 2014 at 10:07:27AM -0300, Gustavo Zacarias wrote:
> Openssl uses libz hence pull it in,

I don't see openssl or libz in this patch. But...

> also needs to explicitly link
> against libpthread. Fixes:
> http://autobuild.buildroot.net/results/259/2592612be38a2c1dde21b44be2ecf25d1cc5211a/
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/atftp/atftp.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk
> index 1d6a7c3..a018b9d 100644
> --- a/package/atftp/atftp.mk
> +++ b/package/atftp/atftp.mk
> @@ -9,10 +9,15 @@ ATFTP_SITE = http://sourceforge.net/projects/atftp/files/
>  ATFTP_LICENSE = GPLv2+
>  ATFTP_LICENSE_FILES = LICENSE
>  ATFTP_CONF_OPT = --disable-libwrap --disable-mtftp
> +# For static we need to explicitly link against libpthread
> +ATFTP_LIBS = -lpthread
> +ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)"
>  
>  ifeq ($(BR2_PACKAGE_READLINE),y)
>  ATFTP_DEPENDENCIES += readline
>  ATFTP_CONF_OPT += --enable-libreadline
> +# For static, readline links with ncurses
> +ATFTP_LIBS += -lncurses

... ncurses in not mentioned in the commit log.

>  else
>  ATFTP_CONF_OPT += --disable-libreadline
>  endif

baruch
Gustavo Zacarias July 10, 2014, 1:55 p.m. UTC | #2
On 07/10/2014 10:52 AM, Baruch Siach wrote:

> Hi Gustavo,
> 
> On Thu, Jul 10, 2014 at 10:07:27AM -0300, Gustavo Zacarias wrote:
>> Openssl uses libz hence pull it in,
> 
> I don't see openssl or libz in this patch. But...

Brain fart with the inadyn static tests, i'll resend :)
Thanks.
Regards.
diff mbox

Patch

diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk
index 1d6a7c3..a018b9d 100644
--- a/package/atftp/atftp.mk
+++ b/package/atftp/atftp.mk
@@ -9,10 +9,15 @@  ATFTP_SITE = http://sourceforge.net/projects/atftp/files/
 ATFTP_LICENSE = GPLv2+
 ATFTP_LICENSE_FILES = LICENSE
 ATFTP_CONF_OPT = --disable-libwrap --disable-mtftp
+# For static we need to explicitly link against libpthread
+ATFTP_LIBS = -lpthread
+ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)"
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
 ATFTP_DEPENDENCIES += readline
 ATFTP_CONF_OPT += --enable-libreadline
+# For static, readline links with ncurses
+ATFTP_LIBS += -lncurses
 else
 ATFTP_CONF_OPT += --disable-libreadline
 endif