X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/370d9aa189aefb10aa54d431de802e5a1d5b1c4f..83d11d6e040761d0843585db4148153e040d4e87:/packages/gdb/build.sh

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 4d802d9c..0a4ce857 100755
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -1,18 +1,28 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
 TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
 TERMUX_PKG_DEPENDS="liblzma, libexpat, readline"
-TERMUX_PKG_VERSION=7.11
+TERMUX_PKG_VERSION=7.11.1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
 # gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-readline --with-curses --enable-static ac_cv_func_getpwent=no ac_cv_func_getpwnam=no"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gdb/python share/gdb/syscalls share/gdb/system-gdbinit"
-
 TERMUX_PKG_MAKE_INSTALL_TARGET="-C gdb install"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
-# For frexp(3) usage:
-LDFLAGS+=" -lm"
+termux_step_pre_configure() {
+	# For frexp(3) usage:
+	LDFLAGS+=" -lm"
+
+	# Fix "undefined reference to 'rpl_gettimeofday'" when building on x86:
+	export gl_cv_func_gettimeofday_clobber=no
+	export gl_cv_func_gettimeofday_posix_signature=yes
+}
 
-# Fix "undefined reference to 'rpl_gettimeofday'" when building on x86:
-export gl_cv_func_gettimeofday_clobber=no
-export gl_cv_func_gettimeofday_posix_signature=yes
+termux_step_post_extract_package () {
+	if [ $TERMUX_ARCH = aarch64 ]; then
+		# Fix problem with <stdlib.h> including <memory.h>:
+		mv $TERMUX_PKG_SRCDIR/sim/aarch64/{memory.h,memory_sim.h}
+		perl -p -i -e 's/memory.h/memory_sim.h/' $TERMUX_PKG_SRCDIR/sim/aarch64/*c
+	fi
+}