vlc | branch: master | Rafaël Carré <[email protected]> | Tue Nov 22 23:29:05 2011 -0500| [cba2b87e98faf0e5aaadf4b0602b622c0823df9e] | committer: Rafaël Carré
contrib: gnutls: skip automake > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cba2b87e98faf0e5aaadf4b0602b622c0823df9e --- contrib/src/gnutls/gnutls-no-egd.patch | 29 +++++++++++++++++++++++++++++ contrib/src/gnutls/rules.mak | 1 - 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/contrib/src/gnutls/gnutls-no-egd.patch b/contrib/src/gnutls/gnutls-no-egd.patch index bd0dbd9..5a83f92 100644 --- a/contrib/src/gnutls/gnutls-no-egd.patch +++ b/contrib/src/gnutls/gnutls-no-egd.patch @@ -7,6 +7,35 @@ diff -ru gnutls.orig//lib/nettle/Makefile.am gnutls//lib/nettle/Makefile.am -libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h +libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c +--- gnutls/lib/nettle/Makefile.in.orig 2011-11-22 23:27:22.099568057 -0500 ++++ gnutls/lib/nettle/Makefile.in 2011-11-22 23:27:45.711685158 -0500 +@@ -117,8 +117,7 @@ + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libcrypto_la_LIBADD = +-am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo \ +- egd.lo ++am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo + libcrypto_la_OBJECTS = $(am_libcrypto_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +@@ -829,7 +828,7 @@ + -I$(srcdir)/../includes -I$(builddir)/../includes \ + -I$(srcdir)/.. $(am__append_1) + noinst_LTLIBRARIES = libcrypto.la +-libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h ++libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c + all: all-am + + .SUFFIXES: +@@ -883,7 +882,6 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egd.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi.Plo@am__quote@ diff -ru gnutls.orig//lib/nettle/rnd.c gnutls//lib/nettle/rnd.c --- gnutls.orig//lib/nettle/rnd.c 2011-07-19 20:25:09.000000000 +0300 +++ gnutls//lib/nettle/rnd.c 2011-07-19 20:26:47.000000000 +0300 diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 5da6fec..73a8456 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -48,7 +48,6 @@ DEPS_gnutls = nettle $(DEPS_nettle) endif .gnutls: gnutls - cd $< && automake cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF) cd $</lib && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
