X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/7ce5638519cda066cd6adc547a574050c235c551..f8cce0c098bdfbfa2b6fb67933a08c2bd72db4b4:/packages/libgcrypt/build.sh

diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh
index 12672b86..2ff979ca 100755
--- a/packages/libgcrypt/build.sh
+++ b/packages/libgcrypt/build.sh
@@ -1,22 +1,23 @@
-TERMUX_PKG_VERSION=1.7.3
-TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/libgcrypt/
+TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libgcrypt/
 TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG"
-TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_VERSION=1.7.6
+TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_SHA256=626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc
 TERMUX_PKG_DEPENDS="libgpg-error"
 # configure tries to detect pthreads by linking with -lpthread, which does not exist on Android:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_pthread_pthread_create=yes"
 
 termux_step_pre_configure () {
-	LDFLAGS="$LDFLAGS -llog" # libgcrypt uses syslog, which we redirect to android logging
+	# libgcrypt uses syslog, which we redirect to android logging:
+	LDFLAGS="$LDFLAGS -llog"
 
+	CFLAGS+=" -no-integrated-as"
 	if [ $TERMUX_ARCH = "arm" ]; then
 		# See http://marc.info/?l=gnupg-devel&m=139136972631909&w=3
 		CFLAGS+=" -mno-unaligned-access"
 		# Avoid text relocations:
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gcry_cv_gcc_inline_asm_neon=no"
-	fi
-
-	if [ $TERMUX_ARCH = "i686" -o $TERMUX_ARCH = "x86_64" ]; then
+	elif [ $TERMUX_ARCH = "i686" ] || [ $TERMUX_ARCH = "x86_64" ]; then
 		# Fix i686 android build, also in https://bugzilla.gnome.org/show_bug.cgi?id=724050
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
 	fi