android: build gnutls

Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/contrib/src/gnutls/no-create-time-h.patch b/contrib/src/gnutls/no-create-time-h.patch
new file mode 100644 (file)
index 0000000..ac6fe66
--- /dev/null
+++ b/contrib/src/gnutls/no-create-time-h.patch
@@ -0,0 +1,11 @@
+--- gnutls/lib/gl/Makefile.am  2011-04-07 17:30:44.000000000 -0700
++++ gnutls/lib/gl/Makefile.am  2012-03-02 19:51:53.576555217 -0800
+@@ -891,7 +891,7 @@ EXTRA_DIST += sys_stat.in.h
+ 
+ ## begin gnulib module time
+ 
+-BUILT_SOURCES += time.h
++#BUILT_SOURCES += time.h
+ 
+ # We need the following in order to create <time.h> when the system
+ # doesn't have one that works with the given compiler.

diff --git a/contrib/src/gnutls/no-gl.patch b/contrib/src/gnutls/no-gl.patch
deleted file mode 100644 (file)
index ac2b92a..0000000
--- a/contrib/src/gnutls/no-gl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnutls/lib/Makefile.am.orig        2011-12-25 23:15:45.170377002 -0500
-+++ gnutls/lib/Makefile.am     2011-12-25 23:15:54.094377001 -0500
-@@ -23,7 +23,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4 -I gl/m4
- 
--SUBDIRS = gl po includes x509
-+SUBDIRS = po includes x509
- if ENABLE_MINITASN1
- SUBDIRS += minitasn1
- endif
-@@ -120,7 +120,7 @@
- libgnutls_la_LDFLAGS = -no-undefined \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
--libgnutls_la_LIBADD = gl/liblgnu.la x509/libgnutls_x509.la \
-+libgnutls_la_LIBADD = x509/libgnutls_x509.la \
-       $(LTLIBZ)  $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
-       $(LTLIBPTHREAD)
- 

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 7802f694c8a29e40638e98bbf05a2aebc51e1ba3..6c4fcc2501d4b45174aa33c4cce7149a4654be91 100644 (file)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -19,7 +19,7 @@ ifdef HAVE_WIN32
        $(APPLY) $(SRC)/gnutls/gnutls-win32.patch
 endif
 ifdef HAVE_ANDROID
-       $(APPLY) $(SRC)/gnutls/no-gl.patch
+       $(APPLY) $(SRC)/gnutls/no-create-time-h.patch
 endif
        $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
        $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
@@ -46,6 +46,9 @@ endif
 ifdef HAVE_MACOSX
 USE_GCRYPT=1
 endif
+ifdef HAVE_ANDROID
+USE_GCRYPT=1
+endif
 
 ifeq (1,$(USE_GCRYPT))
 GNUTLS_CONF += --with-libgcrypt
@@ -57,7 +60,9 @@ endif
 .gnutls: gnutls
 ifdef HAVE_ANDROID
        $(RECONF)
-endif
+       cd $< && $(HOSTVARS) gl_cv_header_working_stdint_h=yes ./configure $(GNUTLS_CONF)
+else
        cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
+endif
        cd $</lib && $(MAKE) install
        touch $@