vlc | branch: master | Rafaël Carré <[email protected]> | Mon Dec 26 21:13:32 2011 -0500| [937f97f2dac655071db62faf2e148b905ec41b94] | committer: Rafaël Carré
contrib: gnutls: fix android build gl/ builds replacements for standard headers in case the system ones don't work but it has the reverse effect: provided headers work and built ones don't > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=937f97f2dac655071db62faf2e148b905ec41b94 --- contrib/src/gnutls/no-gl.patch | 20 ++++++++++++++++++++ contrib/src/gnutls/rules.mak | 6 ++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/contrib/src/gnutls/no-gl.patch b/contrib/src/gnutls/no-gl.patch new file mode 100644 index 0000000..ac2b92a --- /dev/null +++ b/contrib/src/gnutls/no-gl.patch @@ -0,0 +1,20 @@ +--- 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 631d9c2..1e12fc4 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -18,6 +18,9 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls ifdef HAVE_WIN32 $(APPLY) $(SRC)/gnutls/gnutls-win32.patch endif +ifdef HAVE_ANDROID + $(APPLY) $(SRC)/gnutls/no-gl.patch +endif $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch $(UPDATE_AUTOCONFIG) $(MOVE) @@ -51,6 +54,9 @@ DEPS_gnutls = nettle $(DEPS_nettle) endif .gnutls: gnutls +ifdef HAVE_ANDROID + $(RECONF) +endif cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF) cd $</lib && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
