]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
projects / coffee / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 463cb47)
stunnel: fix static link
authorBaruch Siach <baruch@tkos.co.il>
Sat, 24 Dec 2016 19:10:42 +0000 (21:10 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 27 Dec 2016 10:14:39 +0000 (11:14 +0100)
zlib is a dependency of OpenSSL. Take that into account when linking
statically.

Fixes:
http://autobuild.buildroot.net/results/dfe/dfe7c82c7976912378e33e03ea4c677bee6a778d/
http://autobuild.buildroot.net/results/48c/48cb55428613e91abfe8e71456182082d9eabb75/
http://autobuild.buildroot.net/results/810/81029efad8b9e2f48c26a7b20f62c90844fc86df/

and many more.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/stunnel/stunnel.mk patch | blob | history

diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 5e35d672683bc45e3bf5d9e95ded1477ed1fe697..f98e7b59eb2ae4e26996e2960c2f8a7da4e81d7f 100644 (file)
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -11,7 +11,8 @@ STUNNEL_DEPENDENCIES = openssl
 STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \
        --disable-libwrap
 STUNNEL_CONF_ENV = \
-       ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
+       ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \
+       LIBS=$(if $(BR2_STATIC_LIBS),-lz)
 STUNNEL_LICENSE = GPLv2+
 STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL