[vlc-commits] contrib: gcrypt: fix linking of asm when cross compiling to x86

Rafaël Carré git at videolan.org
Wed Jul 25 10:01:40 CEST 2012


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jul 25 10:01:03 2012 +0200| [4e98f4d47e4686831258be4c30ff434f4bd5ca80] | committer: Rafaël Carré

contrib: gcrypt: fix linking of asm when cross compiling to x86

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

 contrib/src/gcrypt/rules.mak |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 4f9d227..ebc6c4b 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -26,6 +26,11 @@ ifdef HAVE_BSD
 CONFIGURE_OPTS += --disable-asm --disable-aesni-support
 endif
 endif
+ifdef HAVE_ANDROID
+ifeq ($(ANDROID_ABI), x86)
+CONFIGURE_OPTS += ac_cv_sys_symbol_underscore=no
+endif
+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)



More information about the vlc-commits mailing list