From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 23 Nov 2016 23:34:10 +0000 (-0500)
Subject: gawk: Replace /bin/sh -> $PREFIX/bin/sh
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/951e2f60a78510492d148146f2b821c814af0859?hp=66f3991fb392c98c10c2097fe9fcbaaa520786b7

gawk: Replace /bin/sh -> $PREFIX/bin/sh

Fixes #562.
---

diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh
index 5af451a7..ffa027ec 100644
--- a/packages/gawk/build.sh
+++ b/packages/gawk/build.sh
@@ -1,8 +1,8 @@
-TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/gawk/
-TERMUX_PKG_DESCRIPTION="Interpreted programming language designed for text processing and typically used as a data extraction and reporting tool"
+TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gawk/
+TERMUX_PKG_DESCRIPTION="Programming language designed for text processing"
 TERMUX_PKG_DEPENDS="libandroid-support, libmpfr, libgmp, readline"
 TERMUX_PKG_VERSION=4.1.4
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1"
 
diff --git a/packages/gawk/io.c.patch b/packages/gawk/io.c.patch
new file mode 100644
index 00000000..51604a3d
--- /dev/null
+++ b/packages/gawk/io.c.patch
@@ -0,0 +1,30 @@
+diff -u -r ../gawk-4.1.4/io.c ./io.c
+--- ../gawk-4.1.4/io.c	2016-08-24 15:31:55.000000000 -0400
++++ ./io.c	2016-11-23 18:27:30.481573610 -0500
+@@ -1976,7 +1976,7 @@
+ 
+ 			signal(SIGPIPE, SIG_DFL);
+ 
+-			execl("/bin/sh", "sh", "-c", str, NULL);
++			execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
+ 			_exit(errno == ENOENT ? 127 : 126);
+ 
+ 		case -1:
+@@ -2152,7 +2152,7 @@
+ 			fatal(_("close of pipe failed (%s)"), strerror(errno));
+ 		/* stderr does NOT get dup'ed onto child's stdout */
+ 		signal(SIGPIPE, SIG_DFL);
+-		execl("/bin/sh", "sh", "-c", str, NULL);
++		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
+ 		_exit(errno == ENOENT ? 127 : 126);
+ 	}
+ #endif /* NOT __EMX__, NOT __MINGW32__ */
+@@ -2346,7 +2346,7 @@
+ 		if (close(p[0]) == -1 || close(p[1]) == -1)
+ 			fatal(_("close of pipe failed (%s)"), strerror(errno));
+ 		signal(SIGPIPE, SIG_DFL);
+-		execl("/bin/sh", "sh", "-c", cmd, NULL);
++		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, NULL);
+ 		_exit(errno == ENOENT ? 127 : 126);
+ 	}
+ #endif /* NOT __EMX__, NOT __MINGW32__ */