Skip to contentSkip to conversation

gnutls: fix --disable-crywrap

PATCH New Gustavo Zacarias 2 participants 2 messages Dec 16, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH v3 1/1 gnutls: fix --disable-crywrap

Add a patch to really enable the --disable-crywrap option in gnutls. Fixes:
http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: needs gettextize
v3: say "applied"

 ...onfigure-really-make-disable-crywrap-work.patch | 40 ++++++++++++++++++++++
 package/gnutls/gnutls.mk                           |  3 ++
 2 files changed, 43 insertions(+)
 create mode 100644 package/gnutls/0001-configure-really-make-disable-crywrap-work.patch
package/gnutls/0001-configure-really-make-disable-crywrap-work.patch new file +40 -0
new file mode 100644
index 0000000..52d34f0
@@ -0,0 +1,40 @@
+From 996b3741e8c7a5d19ae6c554e062f20c259f52d7 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Mon, 14 Dec 2015 15:16:24 -0300
+Subject: [PATCH] configure: really make --disable-crywrap work
+
+The crywrap variable is set regardless of the state of enable_crywrap,
+hence --disable-crywrap never works.
+Just put the tests for crywrap deps inside the enable_crywrap
+conditional.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+Status: applied upstream.
+
+ configure.ac | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e1d1df0..efacc30 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -836,11 +836,10 @@ AC_ARG_ENABLE(crywrap,
+ 
+ 
+  if test "x$enable_crywrap" != "xno" ; then
+-	AC_CHECK_FUNCS([argp_usage],[ac_argp=yes],[ac_argp=no])
+- fi
+-
+- if test "$ac_cv_func_daemon" != "no" && test "$ac_argp" != "no" && test "$with_libidn" != "no";then
+-  crywrap=yes
++   AC_CHECK_FUNCS([argp_usage],[ac_argp=yes],[ac_argp=no])
++   if test "$ac_cv_func_daemon" != "no" && test "$ac_argp" != "no" && test "$with_libidn" != "no";then
++     crywrap=yes
++   fi
+  fi
+ 
+ fi
+-- 
+2.4.10
+
package/gnutls/gnutls.mk +3 -0
index 452d382..6c01c1b 100644
@@ -11,6 +11,9 @@ GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
 GNUTLS_LICENSE = GPLv3+, LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER
 GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
+# For 0001-configure-really-make-disable-crywrap-work.patch
+GNUTLS_AUTORECONF = YES
+GNUTLS_GETTEXTIZE = YES
 GNUTLS_CONF_OPTS = \
 	--disable-doc \
 	--disable-guile \
Signature · 1 line
2.4.10
Applied
#1 lore raw

PATCH v3 1/1 gnutls: fix --disable-crywrap

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias

Add a patch to really enable the --disable-crywrap option in gnutls. Fixes:
http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/

Signed-off-by Gustavo Zacarias <[email protected]>

---
v2: needs gettextize
v3: say "applied"

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com