From bf76a820547f3d7e7cdb9088fa9e70b58a4790c4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 9 Oct 2016 19:02:52 -0400
Subject: [PATCH] gdb: Update from 7.11.1 to 7.12

---
 packages/gdb/build.sh                                  |  9 ++++++---
 .../gdb/gdb-common-signals-state-save-restore.c.patch  | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 packages/gdb/gdb-common-signals-state-save-restore.c.patch

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index c97ccd0e..4ca56415 100755
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -1,8 +1,7 @@
 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.1
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=7.12
 TERMUX_PKG_SRCURL=https://mirrors.kernel.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"
@@ -14,9 +13,13 @@ termux_step_pre_configure() {
 	# For frexp(3) usage:
 	LDFLAGS+=" -lm"
 
-	# Fix "undefined reference to 'rpl_gettimeofday'" when building on x86:
+	# Fix "undefined reference to 'rpl_gettimeofday'" when building:
 	export gl_cv_func_gettimeofday_clobber=no
 	export gl_cv_func_gettimeofday_posix_signature=yes
+	export gl_cv_func_realpath_works=yes
+	export gl_cv_func_lstat_dereferences_slashed_symlink=yes
+	export gl_cv_func_memchr_works=yes
+	export gl_cv_func_stat_file_slash=yes
 }
 
 termux_step_post_extract_package () {
diff --git a/packages/gdb/gdb-common-signals-state-save-restore.c.patch b/packages/gdb/gdb-common-signals-state-save-restore.c.patch
new file mode 100644
index 00000000..fe74d2dd
--- /dev/null
+++ b/packages/gdb/gdb-common-signals-state-save-restore.c.patch
@@ -0,0 +1,18 @@
+FIXME: Why is this patch needed?
+
+diff -u -r ../gdb-7.12/gdb/common/signals-state-save-restore.c ./gdb/common/signals-state-save-restore.c
+--- ../gdb-7.12/gdb/common/signals-state-save-restore.c	2016-10-07 13:04:17.000000000 -0400
++++ ./gdb/common/signals-state-save-restore.c	2016-10-09 18:39:27.866619885 -0400
+@@ -58,10 +58,12 @@
+       else if (res == -1)
+ 	perror_with_name (("sigaction"));
+ 
++#ifndef __ANDROID__
+       /* If we find a custom signal handler already installed, then
+ 	 this function was called too late.  */
+       if (oldact->sa_handler != SIG_DFL && oldact->sa_handler != SIG_IGN)
+ 	internal_error (__FILE__, __LINE__, _("unexpected signal handler"));
++#endif
+     }
+ #endif
+ }
-- 
2.11.0