X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..bb27a0ec420cb5afdba3988cbbd7d458036a4b6e:/packages/libgpg-error/build.sh

diff --git a/packages/libgpg-error/build.sh b/packages/libgpg-error/build.sh
index c1357111..6f79bb4b 100755
--- a/packages/libgpg-error/build.sh
+++ b/packages/libgpg-error/build.sh
@@ -1,13 +1,20 @@
-TERMUX_PKG_VERSION=1.19
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error/
 TERMUX_PKG_DESCRIPTION="Small library that defines common error values for all GnuPG components"
+TERMUX_PKG_VERSION=1.22
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp"
 
+termux_step_post_extract_package () {
+	# Upstream only has Android definitions for platform-specific lock objects.
+	# See https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html
+	# for how to generate a lock-obj header file on devices.
 
-termux_step_post_configure () {
-	# To fix non-arm builds, see:
-	# https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html
-	# https://gitorious.org/vlc/vlc/commit/3054560987971aff19c496db38834458f8c29377
-	cp $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.linux-android.h
+	# For aarch64 this was generated on a device:
+	cp $TERMUX_PKG_BUILDER_DIR/lock-obj-pub.aarch64-unknown-linux-android.h $TERMUX_PKG_SRCDIR/src/syscfg/
+
+	if [ $TERMUX_ARCH = i686 ]; then
+		# Android i686 has same config as arm (verified by generating a file on a i686 device):
+		cp $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h \
+		   $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.linux-android.h
+	fi
 }