[vlc-commits] Revert "contrib: gcrypt: disable tests"

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jul 25 09:33:35 2012 +0200| [db2a47893b086845841cabf4ce5359d515865c02] | committer: Rafaël Carré

Revert "contrib: gcrypt: disable tests"

This reverts commit 5fc0ccda71e26870b077c6bc10952033f8abd16b.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db2a47893b086845841cabf4ce5359d515865c02
---

 contrib/src/gcrypt/notests.patch |   11 -----------
 contrib/src/gcrypt/rules.mak     |    3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/contrib/src/gcrypt/notests.patch b/contrib/src/gcrypt/notests.patch
deleted file mode 100644
index 823a558..0000000
--- a/contrib/src/gcrypt/notests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgcrypt/Makefile.am.orig	2012-07-23 16:41:58.927873202 +0200
-+++ libgcrypt/Makefile.am	2012-07-23 16:42:05.723873200 +0200
-@@ -23,7 +23,7 @@
-   --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
- 
- DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
--SUBDIRS =         compat mpi cipher random src doc tests
-+SUBDIRS =         compat mpi cipher random src doc
- EXTRA_DIST = autogen.sh README.SVN
- DISTCLEANFILES =
- 
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index f785351..4f9d227 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -11,7 +11,6 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(UNPACK)
-	$(APPLY) $(SRC)/gcrypt/notests.patch
 	$(MOVE)
 
 DEPS_gcrypt = gpg-error
@@ -28,7 +27,7 @@ CONFIGURE_OPTS += --disable-asm --disable-aesni-support
 endif
 endif
 .gcrypt: libgcrypt
-	$(RECONF)
+	#$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160,sha512 --enable-pubkey-ciphers=dsa,rsa,ecc $(CONFIGURE_OPTS)
 	cd $< && $(MAKE) install
 	touch $@