From dcd0b3cc7b585835a9f4fb76264919946456dcaf Mon Sep 17 00:00:00 2001 From: Antoine Pierlot-Garcin Date: Tue, 4 Feb 2014 15:57:43 +0100 Subject: [PATCH] gnutls: fix libz autodetection failure The configure script finds libz in the distribution libraries, which causes zlib support to be dropped from the cross-compiled GnuTLS. Signed-off-by: Antoine Pierlot-Garcin Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 73b525d70f..c0bd778264 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -28,8 +28,9 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \ gl_cv_func_gettimeofday_clobber=no GNUTLS_INSTALL_STAGING = YES -# libpthread autodetection poisons the linkpath +# libpthread and libz autodetection poison the linkpath GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) +GNUTLS_CONF_OPT += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr) # gnutls needs libregex, but pcre can be used too # The check isn't cross-compile friendly