From 7dc9988eea3b2a1767dccd7863aabb79b7b6f3a5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 15 Nov 2016 23:49:07 +0000
Subject: [PATCH] libgcrypt: enable asm support, fix crosscompiling with
 enabled asm support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
(cherry picked from commit 3cda541a8aee5664bf9fe1247e8014b70ade4a32)
---
 packages/security/libgcrypt/package.mk        |  5 +++-
 ...ibgcrypt-ac_cv_sys_symbol_underscore.patch | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 packages/security/libgcrypt/patches/libgcrypt-ac_cv_sys_symbol_underscore.patch

diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk
index dea1018a9b..5d349fc43f 100644
--- a/packages/security/libgcrypt/package.mk
+++ b/packages/security/libgcrypt/package.mk
@@ -31,7 +31,10 @@ PKG_LONGDESC="Libgcrypt is a general purpose cryptographic library based on the
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-asm --with-gnu-ld --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr"
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_sys_symbol_underscore=no \
+                           --enable-asm \
+                           --with-gnu-ld \
+                           --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr"
 
 post_makeinstall_target() {
   sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config
diff --git a/packages/security/libgcrypt/patches/libgcrypt-ac_cv_sys_symbol_underscore.patch b/packages/security/libgcrypt/patches/libgcrypt-ac_cv_sys_symbol_underscore.patch
new file mode 100644
index 0000000000..95db0fbba8
--- /dev/null
+++ b/packages/security/libgcrypt/patches/libgcrypt-ac_cv_sys_symbol_underscore.patch
@@ -0,0 +1,27 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index a7bc0fa..1a5bffc 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -76,13 +76,14 @@ case "${host}" in
+     i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
+         ac_cv_sys_symbol_underscore=yes
+         ;;
+-    *)
+-      if test "$cross_compiling" = yes; then
+-        if test "x$ac_cv_sys_symbol_underscore" = x ; then
+-           ac_cv_sys_symbol_underscore=yes
+-        fi
+-      else
+-         tmp_do_check="yes"
++    *) if test -z "$ac_cv_sys_symbol_underscore"; then
++         if test "$cross_compiling" = yes; then
++           if test "x$ac_cv_sys_symbol_underscore" = x ; then
++              ac_cv_sys_symbol_underscore=yes
++           fi
++         else
++            tmp_do_check="yes"
++         fi
+       fi
+        ;;
+ esac
+