[vlc-commits] contrib: fix gcrypt build on osx

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Nov 22 21:28:44 2011 -0500| [7c98e07cc07295b40f034a31c0fa35ed001434a0] | committer: Rafaël Carré

contrib: fix gcrypt build on osx

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

 contrib/TODO                 |    3 ---
 contrib/src/gcrypt/rules.mak |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/TODO b/contrib/TODO
index e4040d1..3de60af 100644
--- a/contrib/TODO
+++ b/contrib/TODO
@@ -9,9 +9,6 @@ nettle
 
         for 32 bits only:
 
-gcrypt
-    rijndael.c:895: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-
 gmp
     tmp-dive_1.s:108:junk `@GOT' after expression
 
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 7bbc2b7..72fde6b 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -19,6 +19,9 @@ CONFIGURE_OPTS =
 ifdef HAVE_WIN64
 CONFIGURE_OPTS += --disable-asm
 endif
+ifdef HAVE_MACOSX
+CONFIGURE_OPTS += --disable-aesni-support
+endif
 .gcrypt: libgcrypt
 	#$(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)