Skip to contentSkip to conversation

gnutls: fix libz autodetection failure

PATCH New Antoine Pierlot-Garcin 3 participants 3 messages Feb 4, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/gnutls/gnutls.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/gnutls/gnutls.mk +2 -1
index 73b525d..c0bd778 100644
@@ -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
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/1 gnutls: fix libz autodetection failure

Quoted 4 lines · Antoine Pierlot-Garcin

The configure script finds libz in the distribution libraries, which causes zlib support to be dropped from the cross-compiled GnuTLS.

I had noticed the -L/usr/lib in one of the link commands but didn't
worry about it at the time :-)

Regards,
Arnout

Quoted 20 lines
---
 package/gnutls/gnutls.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/gnutls/gnutls.mk +2 -1
index 73b525d..c0bd778 100644
@@ -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
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 gnutls: fix libz autodetection failure

In reply to Antoine Pierlot-Garcin
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Antoine" == Antoine Pierlot-Garcin <[email protected]> writes:

The configure script finds libz in the distribution libraries, which causes zlib support to be dropped from the cross-compiled GnuTLS.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard