[vlc-devel] [PATCH 09/14] contrib: gcrypt: fix building on OSX 10.9 with clang

[Vittorio Giovara]

From: Konstantin Pavlov <thresh at nginx.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
---
 contrib/src/gcrypt/mpi-darwin13.patch | 15 +++++++++++++++
 contrib/src/gcrypt/rules.mak          |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 contrib/src/gcrypt/mpi-darwin13.patch

diff --git a/contrib/src/gcrypt/mpi-darwin13.patch b/contrib/src/gcrypt/mpi-darwin13.patch
new file mode 100644
index 0000000..a1f9af5
--- /dev/null
+++ b/contrib/src/gcrypt/mpi-darwin13.patch
@@ -0,0 +1,15 @@
+--- a/mpi/config.links	2013-07-25 13:10:04.000000000 +0400
++++ b/mpi/config.links	2013-11-10 15:36:20.000000000 +0400
+@@ -100,6 +100,12 @@
+ 	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
+ 	path="i586 i386"
+ 	;;
++    x86_64-apple-darwin13*)
++    echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
++    cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
++    path="amd64"
++        mpi_cpu_arch="x86"
++    ;;
+     i[3467]86*-*-*)
+ 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+ 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index ced0f43..d26c087 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -14,6 +14,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
 	$(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
 	$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
+	$(APPLY) $(SRC)/gcrypt/mpi-darwin13.patch
 	$(MOVE)
 
 DEPS_gcrypt = gpg-error
-- 
1.8.5.2 (Apple Git-48)