gdb: Use termux-provided bin/sh instead of system

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 9fdc2678bf03c9215afd0628e6b4cff7d72cb4db..915fdb91556225502840eb33ab6b1bcc5bfd5ed4 100755 (executable)
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -2,6 +2,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.9.1
+TERMUX_PKG_BUILD_REVISION=1
 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"

diff --git a/packages/gdb/cli_cmds_c_bin_sh.patch b/packages/gdb/cli_cmds_c_bin_sh.patch
index 1080011fe905f88955e9d8bfe0eaac2fd8220bf6..c74c3f8338b6279d9771980f875a259945bcd300 100644 (file)
--- a/packages/gdb/cli_cmds_c_bin_sh.patch
+++ b/packages/gdb/cli_cmds_c_bin_sh.patch
@@ -6,7 +6,7 @@ diff -u -r ../gdb-7.6.2/gdb/cli/cli-cmds.c ./gdb/cli/cli-cmds.c
  
        if ((user_shell = (char *) getenv ("SHELL")) == NULL)
 -      user_shell = "/bin/sh";
-+      user_shell = "/system/bin/sh";
++      user_shell = "@TERMUX_PREFIX@/bin/sh";
  
        /* Get the name of the shell for arg0.  */
        p = lbasename (user_shell);

diff --git a/packages/gdb/fork_child_bin_sh.patch b/packages/gdb/fork_child_bin_sh.patch
index a2b98eee39b1a1e4c993cd655aac7dcdf8cc80df..f891677bb70ed495502fb428f885d5ec231c982f 100644 (file)
--- a/packages/gdb/fork_child_bin_sh.patch
+++ b/packages/gdb/fork_child_bin_sh.patch
@@ -6,6 +6,6 @@ diff -u -r ../gdb-7.6.2/gdb/fork-child.c ./gdb/fork-child.c
  
  /* This just gets used as a default if we can't find SHELL.  */
 -#define SHELL_FILE "/bin/sh"
-+#define SHELL_FILE "/system/bin/sh"
++#define SHELL_FILE "@TERMUX_PREFIX@/bin/sh"
  
  extern char **environ;