gnutls: fix --disable-crywrap
PATCH v2 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/
Status: sent upstream (mailing list).
---
v2: need gettextize
...onfigure-really-make-disable-crywrap-work.patch | 38 ++++++++++++++++++++++ package/gnutls/gnutls.mk | 3 ++ 2 files changed, 41 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 +38 -0
@@ -0,0 +1,38 @@ +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]> +--- + 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
@@ -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
PATCH v2 1/1 gnutls: fix --disable-crywrap
Hi Gustavo,
Quoted 5 lines · Gustavo Zacarias
Add a patch to really enable the --disable-crywrap option in gnutls. Fixes:
http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/Status: sent upstream (mailing list).
This comment would be more helpful in the patch itself.
Quoted 15 lines
Signed-off-by Gustavo Zacarias <[email protected]>---
v2: need gettextize...onfigure-really-make-disable-crywrap-work.patch | 38 ++++++++++++++++++++++ package/gnutls/gnutls.mk | 3 ++ 2 files changed, 41 insertions(+) create mode 100644 package/gnutls/0001-configure-really-make-disable-crywrap-work.patchpackage/gnutls/0001-configure-really-make-disable-crywrap-work.patch new file +0
-0
package/gnutls/0001-configure-really-make-disable-crywrap-work.patch line 9
Quoted 9 lines
package/gnutls/0001-configure-really-make-disable-crywrap-work.patch new file +9
-0@@ -0,0 +1,38 @@ +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.
Also, a link to your gnutls submission
(http://lists.gnutls.org/pipermail/gnutls-devel/2015-December/007818.html)
would be helpful.
package/gnutls/0001-configure-really-make-disable-crywrap-work.patch line 11
Quoted 1 line
package/gnutls/0001-configure-really-make-disable-crywrap-work.patch new file +1
-0+Signed-off-by: Gustavo Zacarias <[email protected]>
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH v2 1/1 gnutls: fix --disable-crywrap
Quoted 1 line · Baruch Siach
Hi Gustavo,
Hi Baruch.
Quoted 3 lines
Also, a link to your gnutls submission
(http://lists.gnutls.org/pipermail/gnutls-devel/2015-December/007818.html)
would be helpful.
At the time i sent the patch the archives weren't updated yet, so i didn't have a link to it.
Unfortunately that's quite common of them (archives) taking some time to update.
Regards.
PATCH v2 1/1 gnutls: fix --disable-crywrap
In reply to Gustavo ZacariasGustavo,
Quoted 7 lines · Gustavo Zacarias
Add a patch to really enable the --disable-crywrap option in gnutls. Fixes:
http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/Status: sent upstream (mailing list).
Signed-off-by Gustavo Zacarias <[email protected]>
This patch does not apply (probably because it was based in your tree on other commits that are not in the official Buildroot git repo). Also, it would be good if you could take into account the two comments made by Baruch.
thomas at skate:~/projets/buildroot (master)$ git pwam 556658 Applying patch #556658 using 'git am -s -3'
Description: [v2] gnutls: fix --disable-crywrap
Applying: gnutls: fix --disable-crywrap
fatal: sha1 information is lacking or useless (package/gnutls/gnutls.mk).
error: could not build fake ancestor
Patch failed at 0001 gnutls: fix --disable-crywrap
The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 gnutls: fix --disable-crywrap
Quoted 7 lines · Thomas Petazzoni
Gustavo,
Quoted 4 lines · Gustavo Zacarias
Add a patch to really enable the --disable-crywrap option in gnutls. Fixes:
http://autobuild.buildroot.org/results/d86/d8604fe448bb11395e8443726d09b041eb34c6d5/
Quoted 8 lines
Quoted 3 lines
Status: sent upstream (mailing list).
Signed-off-by Gustavo Zacarias <[email protected]>This patch does not apply (probably because it was based in your tree on other commits that are not in the official Buildroot git repo). Also, it would be good if you could take into account the two comments made by Baruch.
Hi.
It does, after the licensing fixes that were previously sent.
As i mentioned to Baruch and you probably already know, mailing list archives usually don't update quickly, so i didn't have a URL to copy/paste. Mundanely trivial v3 sent.
Regards.
PATCH v2 1/1 gnutls: fix --disable-crywrap
Gustavo,
Quoted 3 lines · Gustavo Zacarias
It does, after the licensing fixes that were previously sent.
As i mentioned to Baruch and you probably already know, mailing list archives usually don't update quickly, so i didn't have a URL to copy/paste.
Sure. If the patch had applied, I would have added the mailing list archive link myself before committing. But since the patch didn't apply as is, and there were plenty of other patches to take care of, I preferred to let you update and resend the patch :)
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com