Use GnuTLS 3.1.12 for Android build

We don't need to build from git any more; there's been a release with the
Android CA support.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/android/Makefile b/android/Makefile
index 14c4d1c12cde57011b574eccb6755e0372bd2c6a..24655286f1bb073242e70b3e5b3ee92f625adf93 100644 (file)
--- a/android/Makefile
+++ b/android/Makefile
@@ -198,25 +198,25 @@ nettle: $(NETTLE_DEPS)
 #
 # Build GnuTLS
 #
-#GNUTLS_VER := 3.1.9
-GNUTLS_SRC := sources/gnutls
+GNUTLS_VER := 3.1.12
+GNUTLS_SRC := sources/gnutls-$(GNUTLS_VER)
 GNUTLS_BUILD := $(TRIPLET)/gnutls
 
 gnutls-$(GNUTLS_VER).tar.xz:
        curl ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/$@ -o $@.tmp && mv $@.tmp $@
 
-#$(GNUTLS_SRC)/configure: gnutls-$(GNUTLS_VER).tar.xz
-#      mkdir -p sources
-#       xz -d < $< | tar xf - -C sources
-#       touch $@
-
-$(GNUTLS_SRC)/configure.ac:
+$(GNUTLS_SRC)/configure: gnutls-$(GNUTLS_VER).tar.xz
        mkdir -p sources
-       cd sources && git clone git://gitorious.org/gnutls/gnutls.git
+       xz -d < $< | tar xf - -C sources
+       touch $@
+
+#$(GNUTLS_SRC)/configure.ac:
+#      mkdir -p sources
+#      cd sources && git clone git://gitorious.org/gnutls/gnutls.git
 
-$(GNUTLS_SRC)/configure: $(GNUTLS_SRC)/configure.ac
-       touch $(GNUTLS_SRC)/ChangeLog
-       cd $(GNUTLS_SRC) && autoreconf -fvi
+#$(GNUTLS_SRC)/configure: $(GNUTLS_SRC)/configure.ac
+#      touch $(GNUTLS_SRC)/ChangeLog
+#      cd $(GNUTLS_SRC) && autoreconf -fvi
 
 $(GNUTLS_BUILD)/Makefile: $(GNUTLS_SRC)/configure $(NETTLE_DEPS)
        mkdir -p $(GNUTLS_BUILD)