5 changed files with 29 additions and 30 deletions
@ -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 |
|
@ -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) |
|
@ -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 |
@ -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) |
||||
|
{ |
Loading…
Reference in new issue