make: Update from 4.2.1 to 4.3

This commit is contained in:
Fredrik Fornwall 2020-01-22 12:05:00 +01:00
parent c1601eab70
commit 209daa77fa
5 changed files with 29 additions and 30 deletions

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/make/
TERMUX_PKG_DESCRIPTION="Tool to control the generation of non-source files from source files"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=4.2.1
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=4.3
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/make/make-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7
TERMUX_PKG_SHA256=e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19
TERMUX_PKG_BREAKS="make-dev"
TERMUX_PKG_REPLACES="make-dev"
# Prevent linking against libelf:

View File

@ -1,12 +0,0 @@
diff -u -r ../make-4.1/job.c ./job.c
--- ../make-4.1/job.c 2014-10-05 12:24:51.000000000 -0400
+++ ./job.c 2015-07-19 17:01:19.751113443 -0400
@@ -69,7 +69,7 @@
#else
-const char *default_shell = "/bin/sh";
+const char *default_shell = "@TERMUX_PREFIX@/bin/sh";
int batch_mode_shell = 0;
#endif

View File

@ -1,15 +0,0 @@
diff --git a/output.c b/output.c
index 65182c4..efa98ad 100644
--- a/output.c
+++ b/output.c
@@ -157,6 +157,10 @@ log_working_directory (int entering)
static void
set_append_mode (int fd)
{
+#ifdef __ANDROID__
+ /* SELinux has a deny rule for append on stderr (eg. SCM_RIGHTS returns MSG_CTRUNC) */
+ if (isatty(fd)) return;
+#endif
#if defined(F_GETFL) && defined(F_SETFL) && defined(O_APPEND)
int flags = fcntl (fd, F_GETFL, 0);
if (flags >= 0)

View File

@ -0,0 +1,12 @@
diff -u -r ../make-4.3/src/job.c ./src/job.c
--- ../make-4.3/src/job.c 2020-01-19 20:32:59.000000000 +0000
+++ ./src/job.c 2020-01-22 11:01:36.728655000 +0000
@@ -77,7 +77,7 @@
#else
-const char *default_shell = "/bin/sh";
+const char *default_shell = "@TERMUX_PREFIX@/bin/sh";
int batch_mode_shell = 0;
#endif

View File

@ -0,0 +1,15 @@
diff -u -r ../make-4.3/src/output.c ./src/output.c
--- ../make-4.3/src/output.c 2020-01-03 07:11:27.000000000 +0000
+++ ./src/output.c 2020-01-22 11:04:03.593327000 +0000
@@ -150,7 +150,10 @@
static void
set_append_mode (int fd)
{
-#if defined(F_GETFL) && defined(F_SETFL) && defined(O_APPEND)
+#ifdef __ANDROID__
+ /* SELinux has a deny rule for append on stderr (eg. SCM_RIGHTS returns MSG_CTRUNC) */
+ if (isatty(fd)) return;
+#elif defined(F_GETFL) && defined(F_SETFL) && defined(O_APPEND)
int flags = fcntl (fd, F_GETFL, 0);
if (flags >= 0)
{