contrib: fix gcrypt build on osx

diff --git a/contrib/TODO b/contrib/TODO
index e4040d16ca6e86e007538c87d58be8b6be04b051..3de60af4879d4a492a3f29fbdc3fec3f04d45f7d 100644 (file)
--- 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 7bbc2b7fc0ef5e58e331dbba74ded0af72b81b5d..72fde6ba5f2d80063ff025ac09600a6af57c749a 100644 (file)
--- 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)