From 16c434c422fc82d2241879dc7a3c6323a9cee362 Mon Sep 17 00:00:00 2001 From: kkostiuk <kateryna.kostiuk@savoirfairelinux.com> Date: Sun, 28 Mar 2021 15:05:02 -0400 Subject: [PATCH] Revert "gnutls: disable libtasn build for darwin" This reverts commit 8a1c2b65508924fc982a88891fdb88f43bb9df86. libtasn1 build fixed in https://review.jami.net/c/ring-daemon/+/17429 Change-Id: I6bf7becb34402cea5f8351bf813a0cd74b7a79f8 --- contrib/src/gnutls/rules.mak | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 96641323e5..3d2996c0f3 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -42,6 +42,7 @@ GNUTLS_CONF := \ --disable-cxx \ --disable-srp-authentication \ --disable-psk-authentication-FIXME \ + --with-included-libtasn1 \ --with-included-unistring \ --disable-openpgp-authentication \ --disable-openssl-compatibility \ @@ -52,10 +53,6 @@ GNUTLS_CONF := \ --without-idn \ $(HOSTCONF) -ifndef HAVE_DARWIN_OS - GNUTLS_CONF += --with-included-libtasn1 -endif - ifdef HAVE_IOS GNUTLS_CONF += --disable-hardware-acceleration endif -- GitLab