From 2d54bd9efc6b41e52c2af278f54b58ae59f77a80 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Thu, 16 Jan 2020 03:04:01 +0200 Subject: [PATCH] libuv: avoid FICLONE ioctl Same reason as for nodejs embedded libuv. --- packages/libuv/build.sh | 1 + packages/libuv/src-unix-fs.c.patch | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/libuv/build.sh b/packages/libuv/build.sh index ccd00993f..c5c3a9b9b 100644 --- a/packages/libuv/build.sh +++ b/packages/libuv/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://libuv.org TERMUX_PKG_DESCRIPTION="Support library with a focus on asynchronous I/O" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.34.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=766985aab854810554381e246ab8c293494bae77d6c3af338bb25a9de4a18fcf TERMUX_PKG_BREAKS="libuv-dev" diff --git a/packages/libuv/src-unix-fs.c.patch b/packages/libuv/src-unix-fs.c.patch index 597d563e9..dc4af3e00 100644 --- a/packages/libuv/src-unix-fs.c.patch +++ b/packages/libuv/src-unix-fs.c.patch @@ -1,7 +1,23 @@ -diff -u -r ../libuv-v1.27.0/src/unix/fs.c ./src/unix/fs.c ---- ../libuv-v1.27.0/src/unix/fs.c 2019-03-16 18:31:48.000000000 +0000 -+++ ./src/unix/fs.c 2019-03-19 22:29:31.285186496 +0000 -@@ -1059,7 +1059,8 @@ +diff -uNr libuv-v1.34.1/src/unix/fs.c libuv-v1.34.1.mod/src/unix/fs.c +--- libuv-v1.34.1/src/unix/fs.c 2020-01-13 01:33:21.000000000 +0200 ++++ libuv-v1.34.1.mod/src/unix/fs.c 2020-01-16 03:03:16.056323725 +0200 +@@ -1161,6 +1161,7 @@ + #endif /* !__linux__ */ + } + ++#ifndef __ANDROID__ + #ifdef FICLONE + if (req->flags & UV_FS_COPYFILE_FICLONE || + req->flags & UV_FS_COPYFILE_FICLONE_FORCE) { +@@ -1181,6 +1182,7 @@ + goto out; + } + #endif ++#endif + + bytes_to_send = src_statsbuf.st_size; + in_offset = 0; +@@ -1317,7 +1319,8 @@ int is_lstat, uv_stat_t* buf) { STATIC_ASSERT(UV_ENOSYS != -1);