make: Bump to 4.4

This commit is contained in:
Tee KOBAYASHI 2022-11-06 18:19:26 +09:00 committed by xtkoba
parent a683c75308
commit 672cbe10bc
4 changed files with 4 additions and 36 deletions

View File

@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Tool to control the generation of non-source files from
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
# Update both make and make-guile to the same version in one PR.
TERMUX_PKG_VERSION=4.3
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=4.4
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/make/make-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19
TERMUX_PKG_SHA256=581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18
TERMUX_PKG_DEPENDS="guile"
TERMUX_PKG_BREAKS="make-dev"
TERMUX_PKG_REPLACES="make-dev"

View File

@ -1,15 +0,0 @@
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)
{

View File

@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Tool to control the generation of non-source files from
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
# Update both make and make-guile to the same version in one PR.
TERMUX_PKG_VERSION=4.3
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=4.4
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/make/make-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19
TERMUX_PKG_SHA256=581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18
TERMUX_PKG_BREAKS="make-dev"
TERMUX_PKG_REPLACES="make-dev"
TERMUX_PKG_GROUPS="base-devel"

View File

@ -1,15 +0,0 @@
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)
{