[vlc-commits] contrib: gcrypt: fix non amd64 builds

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Mar 30 11:50:27 2014 +0200| [1f3c2d276960cfd21572a167f278e470584c170b] | committer: Rafaël Carré

contrib: gcrypt: fix non amd64 builds

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

 .../gcrypt/0001-Fix-assembly-division-check.patch  |   30 ++++++++++++++++++++
 contrib/src/gcrypt/rules.mak                       |    1 +
 2 files changed, 31 insertions(+)

diff --git a/contrib/src/gcrypt/0001-Fix-assembly-division-check.patch b/contrib/src/gcrypt/0001-Fix-assembly-division-check.patch
new file mode 100644
index 0000000..13ec1b4
--- /dev/null
+++ b/contrib/src/gcrypt/0001-Fix-assembly-division-check.patch
@@ -0,0 +1,30 @@
+From ef3e66e168c4b9b86bfc4903001631e53a7125d8 Mon Sep 17 00:00:00 2001
+From: Jussi Kivilinna <jussi.kivilinna at iki.fi>
+Date: Sun, 12 Jan 2014 22:01:28 +0200
+Subject: [PATCH] Fix assembly division check
+
+* configure.ac (gcry_cv_gcc_as_const_division_ok): Correct variable
+name mismatch at '--Wa,--divide' workaround check.
+--
+
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fac5f7a..7d37f94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,7 +1101,7 @@ if test $amd64_as_feature_detection = yes; then
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+             [[__asm__("xorl \$(123456789/12345678), %ebp;\n\t");]])],
+             [gcry_cv_gcc_as_const_division_with_wadivide_ok=yes])])
+-    if test "$gcry_cv_gcc_as_const_division_ok_with_wadivide_ok" = "no" ; then
++    if test "$gcry_cv_gcc_as_const_division_with_wadivide_ok" = "no" ; then
+       # '-Wa,--divide' did not work, restore old flags.
+       CPPFLAGS="$_gcc_cppflags_save"
+     fi
+-- 
+1.9.1
+
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 75a9639..35c29ed 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(UNPACK)
 	$(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
 	$(MOVE)
 
 DEPS_gcrypt = gpg-error