jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: fix --disable-crywrap

Browse Source 
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 <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2015-12-15 21:05:03 -03:00 committed by Thomas Petazzoni
parent 33065a35a4
commit cb2334b926
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package/gnutls/0001-configure-really-make-disable-crywrap-work.patch Normal file
View File

@ -0,0 +1,40 @@
From 996b3741e8c7a5d19ae6c554e062f20c259f52d7 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
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 <gustavo@zacarias.com.ar>
---
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

3
package/gnutls/gnutls.mk
View File

@ -11,6 +11,9 @@ GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
GNUTLS_LICENSE = GPLv3+, LGPLv2.1+ GNUTLS_LICENSE = GPLv3+, LGPLv2.1+
GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER
GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre 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 = \ GNUTLS_CONF_OPTS = \
--disable-doc \ --disable-doc \
--disable-guile \ --disable-guile \