From 6a7a44d1f117d9fe6d05d9002ebd5fad34b02f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 23 Nov 2015 10:59:11 -0500 Subject: [PATCH] gnutls: fix android build on x86 platforms This patch fixes a link issue with GnuTLS when building for x86. Tuleap: #102 Change-Id: Ic46824d95cbf568fedd2a6601a9359acc2672e83 --- contrib/src/gnutls/rules.mak | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 183a6b1be3..35df76cd0e 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -46,9 +46,14 @@ GNUTLS_CONF := \ --disable-openssl-compatibility \ --disable-guile \ --disable-nls \ + --disable-dtls-srtp-support \ --without-libintl-prefix \ $(HOSTCONF) +ifdef HAVE_ANDROID + GNUTLS_CONF += --disable-hardware-acceleration +endif + DEPS_gnutls = nettle $(DEPS_nettle) iconv $(DEPS_iconv) -- GitLab