[tools/depends][target] bump libgcrypt 1.10.1 enable asm

enable asm for all platforms

3 files changed, 25 insertions, 57 deletions

diff --git a/tools/depends/target/libgcrypt/02-fix-armv7-neon.patch b/tools/depends/target/libgcrypt/02-fix-armv7-neon.patch
deleted file mode 100644
index c79cee8a60..0000000000
--- a/tools/depends/target/libgcrypt/02-fix-armv7-neon.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2574,10 +2574,6 @@
-       arm*-*-*)
-          # Build with the assembly implementation
-          GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael-arm.lo"
--
--         # Build with the ARMv8/AArch32 CE implementation
--         GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael-armv8-ce.lo"
--         GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael-armv8-aarch32-ce.lo"
-       ;;
-       aarch64-*-*)
-          # Build with the assembly implementation
-@@ -2904,10 +2904,6 @@
-          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-avx-amd64.lo"
-          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-avx2-bmi2-amd64.lo"
-       ;;
--      arm*-*-*)
--         # Build with the assembly implementation
--         GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-armv8-aarch32-ce.lo"
--      ;;
-       aarch64-*-*)
-          # Build with the assembly implementation
-          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-armv8-aarch64-ce.lo"
-@@ -3043,7 +3043,6 @@
-   arm*-*-*)
-     # Build with the assembly implementation
-     GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha1-armv7-neon.lo"
--    GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha1-armv8-aarch32-ce.lo"
-   ;;
-   aarch64-*-*)
-     # Build with the assembly implementation
diff --git a/tools/depends/target/libgcrypt/LIBGCRYPT-VERSION b/tools/depends/target/libgcrypt/LIBGCRYPT-VERSION
new file mode 100644
index 0000000000..1010bafea5
--- /dev/null
+++ b/tools/depends/target/libgcrypt/LIBGCRYPT-VERSION
@@ -0,0 +1,5 @@
+LIBNAME=libgcrypt
+VERSION=1.10.1
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.bz2
+SHA512=e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
+BYPRODUCT=libgcrypt.a
diff --git a/tools/depends/target/libgcrypt/Makefile b/tools/depends/target/libgcrypt/Makefile
index 66178b80a4..9ad708a35c 100644
--- a/tools/depends/target/libgcrypt/Makefile
+++ b/tools/depends/target/libgcrypt/Makefile
@@ -1,27 +1,24 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile 02-fix-armv7-neon.patch ../../download-files.include
-
-# lib name, version
-LIBNAME=libgcrypt
-VERSION=1.9.4
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-SHA512=d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
-include ../../download-files.include
-
-ifeq ($(OS),osx)
-  CONFIGURE_FLAGS+= --disable-asm --disable-avx-support --disable-avx2-support
-endif
-ifeq ($(findstring arm64, $(CPU)), arm64)
-  CONFIGURE_FLAGS+= --disable-asm
-else
-  CONFIGURE_FLAGS+= --disable-asm --disable-arm-crypto-support
+include ../../Makefile.include LIBGCRYPT-VERSION ../../download-files.include
+DEPS = ../../Makefile.include Makefile LIBGCRYPT-VERSION ../../download-files.include
+
+ifeq ($(OS),android)
+  # Just blanket disable neon support for non arm64 arch
+  ifneq ($(findstring arm64, $(CPU)), arm64)
+    CONFIGURE_FLAGS+= --disable-neon-support
+  endif
 endif
 
-ifeq ($(OS), darwin_embedded)
-  # explicitly disable getentropy for ios/tvos as AC_CHECK_FUNCS(getentropy) incorrectly
-  # succeeds as of libgcrypt 1.9.4
-  CONFIGURE_FLAGS+= ac_cv_func_getentropy=no
+ifeq ($(findstring apple-darwin, $(HOST)), apple-darwin)
+  # required to fix asm link failure due C_SYMBOL_NAME macro not prepending _ to exported symbol
+  # exported symbols only have s single _ instead of double __
+  #   Undefined symbols for architecture x86_64:
+  #   "__gcry_mpih_add_n", referenced from:
+  CONFIGURE_FLAGS+= ac_cv_sys_symbol_underscore=yes
+  ifeq ($(OS), darwin_embedded)
+    # explicitly disable getentropy for ios/tvos as AC_CHECK_FUNCS(getentropy) incorrectly
+    # succeeds as of libgcrypt 1.9.4
+    CONFIGURE_FLAGS+= ac_cv_func_getentropy=no
+  endif
 endif
 
 export GPG_ERROR_CONFIG=$(PREFIX)/bin/gpg-error-config
@@ -30,15 +27,13 @@ export GPG_ERROR_CONFIG=$(PREFIX)/bin/gpg-error-config
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX) --disable-doc --disable-shared $(CONFIGURE_FLAGS)
 
-LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a
+LIBDYLIB=$(PLATFORM)/src/.libs/$(BYPRODUCT)
 
 all: .installed-$(PLATFORM)
 
-
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 -i ../02-fix-armv7-neon.patch
 	# do not build the tests or docs
 	sed -ie "s|\$$(doc) tests||" "$(PLATFORM)/Makefile.am"
 	cd $(PLATFORM); $(AUTORECONF) -vif