X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c2c270c5db6879060d26f9e672e1045ded5d0ba3..9c5f22ade4fe719295dddb35fdf0b22f89c91a58:/packages/libgcrypt/build.sh

diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh
index 18f5a4f8..56daded0 100755
--- a/packages/libgcrypt/build.sh
+++ b/packages/libgcrypt/build.sh
@@ -1,23 +1,27 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libgcrypt/
 TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG"
-# See https://github.com/termux/termux-packages/issues/594 before updating:
-TERMUX_PKG_VERSION=1.7.4.1
-TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.3.tar.bz2
+TERMUX_PKG_VERSION=1.8.2
+TERMUX_PKG_SHA256=c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07
+TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libgpg-error"
+TERMUX_PKG_DEVPACKAGE_DEPENDS="libgpg-error-dev"
 # 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_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_lib_pthread_pthread_create=yes
+--disable-jent-support
+"
 
 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