[depends] bump libgcrypt to 1.8.1

1.7.0 added 'asm: Allow building x86 and amd64 using old compilers'
1.7.0 added --disable-doc configure option
1.7.3 added __aarch64__ support in src/hwf-arm.c

3 files changed, 7 insertions, 63 deletions

diff --git a/tools/depends/target/libgcrypt/01-asm-Allow-building-x86-and-amd64-using-old-compilers.patch b/tools/depends/target/libgcrypt/01-asm-Allow-building-x86-and-amd64-using-old-compilers.patch
deleted file mode 100644
index 864c4fe989..0000000000
--- a/tools/depends/target/libgcrypt/01-asm-Allow-building-x86-and-amd64-using-old-compilers.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5eec04a43e6c562e956353449be931dd43dfe1cc Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 2 Sep 2014 09:25:20 +0200
-Subject: [PATCH] asm: Allow building x86 and amd64 using old compilers.
-
-* src/hwf-x86.c (get_xgetbv): Build only if AVX support is enabled.
---
-
-Old as(1) versions do not support the xgetvb instruction.  Thus build
-this function only if asm support has been requested.
-
-GnuPG-bug-id: 1708
----
- src/hwf-x86.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/hwf-x86.c b/src/hwf-x86.c
-index 0591b4f..7ee246d 100644
---- a/src/hwf-x86.c
-+++ b/src/hwf-x86.c
-@@ -96,6 +96,7 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx,
-     *edx = regs[3];
- }
- 
-+#if defined(ENABLE_AVX_SUPPORT) || defined(ENABLE_AVX2_SUPPORT)
- static unsigned int
- get_xgetbv(void)
- {
-@@ -109,6 +110,7 @@ get_xgetbv(void)
- 
-   return t_eax;
- }
-+#endif /* ENABLE_AVX_SUPPORT || ENABLE_AVX2_SUPPORT */
- 
- #endif /* i386 && GNUC */
- 
-@@ -145,6 +147,7 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx,
-     *edx = regs[3];
- }
- 
-+#if defined(ENABLE_AVX_SUPPORT) || defined(ENABLE_AVX2_SUPPORT)
- static unsigned int
- get_xgetbv(void)
- {
-@@ -158,6 +161,7 @@ get_xgetbv(void)
- 
-   return t_eax;
- }
-+#endif /* ENABLE_AVX_SUPPORT || ENABLE_AVX2_SUPPORT */
- 
- #endif /* x86-64 && GNUC */
- 
--- 
-1.8.4.3
-
diff --git a/tools/depends/target/libgcrypt/03-gcrypt-android-select.patch b/tools/depends/target/libgcrypt/01-gcrypt-android-select.patch
index 59654966c5..a348326183 100644
--- a/tools/depends/target/libgcrypt/03-gcrypt-android-select.patch
+++ b/tools/depends/target/libgcrypt/01-gcrypt-android-select.patch
@@ -1,8 +1,8 @@
 --- src/gcrypt.h.in	2007-12-03 03:48:19.000000000 -0500
 +++ src/gcrypt.h.in	2013-01-21 00:31:48.772740461 -0500
-@@ -41,6 +41,10 @@
+@@ -47,6 +47,10 @@
  
- #include <sys/time.h>
+ @FALLBACK_SOCKLEN_T@
  
 +#if defined(ANDROID)
 +#include <sys/select.h>
diff --git a/tools/depends/target/libgcrypt/Makefile b/tools/depends/target/libgcrypt/Makefile
index f1def7a86f..85bff96264 100644
--- a/tools/depends/target/libgcrypt/Makefile
+++ b/tools/depends/target/libgcrypt/Makefile
@@ -1,9 +1,9 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include 03-gcrypt-android-select.patch Makefile
+DEPS= ../../Makefile.include 01-gcrypt-android-select.patch Makefile
 
 # lib name, version
 LIBNAME=libgcrypt
-VERSION=1.6.2
+VERSION=1.8.1
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.bz2
 
@@ -16,7 +16,7 @@ endif
 
 # configuration settings
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) --disable-shared \
+          ./configure --prefix=$(PREFIX) --disable-doc --disable-shared \
 	  $(CONFIGURE_FLAGS)
 
 LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a
@@ -31,11 +31,10 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 < ../01-asm-Allow-building-x86-and-amd64-using-old-compilers.patch 
-	cd $(PLATFORM); patch -p0 < ../03-gcrypt-android-select.patch
+	cd $(PLATFORM); patch -p0 < ../01-gcrypt-android-select.patch
 	# do not build the tests or docs
 	sed -ie "s|doc tests||" "$(PLATFORM)/Makefile.am"
-	sed -ie "s|!defined (__arm__)|!defined (__arm__) \&\& !defined (__aarch64__)|" "$(PLATFORM)/src/hwf-arm.c"
+	sed -ie "s|\$$(doc) tests||" "$(PLATFORM)/Makefile.am"
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)