From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 1 Jun 2013 20:18:51 +0000 (+0100)
Subject: Use GnuTLS 3.1.12 for Android build
X-Git-Tag: v5.01~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1637c132926e79131a9df494866f3795b7979b3c;p=users%2Fdwmw2%2Fopenconnect.git

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 14c4d1c1..24655286 100644
--- 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)