X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/55835f219e8a222ac3887e5f68ef5090f7a57421..40d2817d3eb00ba45192e822c81fe3189bc227ee:/packages/libgcrypt/build.sh

diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh
index 21140571..10f9af7f 100755
--- a/packages/libgcrypt/build.sh
+++ b/packages/libgcrypt/build.sh
@@ -1,17 +1,23 @@
-TERMUX_PKG_VERSION=1.6.4
-TERMUX_PKG_BUILD_REVISION=2
-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.4
+TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_SHA256=3b67862e2f4711e25c4ce3cc4b48d52a58a3afdcd1d8c6a57f93a1c0ef03e5c6
 TERMUX_PKG_DEPENDS="libgpg-error"
-LDFLAGS="$LDFLAGS -llog" # libgcrypt uses syslog, which we redirect to android logging
+# 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
+
 	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" ]; then
+
+	if [ $TERMUX_ARCH = "i686" -o $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