Skip to contentSkip to conversation

gnutls: fix build failure related to pthreads

PATCH New Gustavo Zacarias 2 participants 3 messages Jan 2, 2013

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 gnutls: fix build failure related to pthreads

The pthreads autodetection posions the linkpath thus making other distribution libraries to take precedence over the cross ones. Leading to failures such as:
http://autobuild.buildroot.net/results/tmp/3f979d4e2186ee31012c332fedec9591890b0b77

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gnutls/gnutls.mk |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
package/gnutls/gnutls.mk +3 -0
index 0166a74..1cbcf70 100644
@@ -17,6 +17,9 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \
 	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)
 GNUTLS_INSTALL_STAGING = YES
 
+# libpthread autodetection poisons the linkpath
+GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
+
 # Some examples in doc/examples use wchar
 define GNUTLS_DISABLE_DOCS
 	$(SED) 's/ doc / /' $(@D)/Makefile.in
Signature · 1 line
1.7.8.6
author
#1 lore raw

PATCH 2/2 gnutls: handle libidn properly

Add it to the dependencies when it's available.
But disable crywrap when it's a nommu system since it uses fork()

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gnutls/gnutls.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/gnutls/gnutls.mk +4 -0
index 1cbcf70..4c918c1 100644
@@ -20,6 +20,10 @@ GNUTLS_INSTALL_STAGING = YES
 # libpthread autodetection poisons the linkpath
 GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
 
+# libidn support for nommu must exclude the crywrap wrapper (uses fork)
+GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
+GNUTLS_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBIDN),libidn)
+
 # Some examples in doc/examples use wchar
 define GNUTLS_DISABLE_DOCS
 	$(SED) 's/ doc / /' $(@D)/Makefile.in
Signature · 1 line
1.7.8.6
#2 lore raw

PATCH 1/2 gnutls: fix build failure related to pthreads

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> The pthreads autodetection posions the linkpath thus making other

s/posions/poisons/

Committed both with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard