Attachment 15248 Details for Bug 13844 – patch for 4.10 cherry-picked from master

[patch] patch for 4.10 cherry-picked from master

0001-Revert-build-Allow-build-when-disable-gnutls-is-set.patch (text/plain), 1.09 KB, created by Andrew Bartlett on 2019-06-13 21:30:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2019-06-13 21:30:50 UTC

Size: 1.09 KB

patch

obsolete

>From a77dafcbd25ddf1f2814eae52afde37668051bf2 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Thu, 13 Jun 2019 23:29:02 +0200
>Subject: [PATCH] Revert "build: Allow build when --disable-gnutls is set"
>
>This reverts commit c46661455de7f89e6270c82b171ac42bedb0cdad.
>---
> lib/mscat/wscript | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
>diff --git a/lib/mscat/wscript b/lib/mscat/wscript
>index 4d1f752a3c1..7ca9ef567ee 100644
>--- a/lib/mscat/wscript
>+++ b/lib/mscat/wscript
>@@ -12,11 +12,7 @@ def configure(conf):
>         if not conf.find_program('asn1Parser', var='ASN1PARSER'):
>             Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)')
> 
>-    # GnuTLS is currently able to be disabled
>-    if conf.env.enable_gnutls:
>-        conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
>-    else:
>-        Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built')
>+    conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
> 
> def build(bld):
>     if (bld.CONFIG_SET('HAVE_LIBTASN1') and
>-- 
>2.17.1
>

Flags:

asn: review+
abartlet: review-

Actions: View

Attachments on bug 13844: 14954 | 15248 | 15270