From: Fredrik Fornwall Date: Sun, 2 Jul 2017 23:28:41 +0000 (+0200) Subject: coreutils: Bump revision after unified headers X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/67474349fd11231e3254fb7fb7fc00e73dcbd484 coreutils: Bump revision after unified headers --- diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh index c2e872ca..47556be7 100755 --- a/packages/coreutils/build.sh +++ b/packages/coreutils/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/ TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project" TERMUX_PKG_VERSION=8.27 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b # pinky has no usage on Android. @@ -20,8 +21,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_HOSTBUILD=yes termux_step_pre_configure() { - CPPFLAGS+=" -DDEFAULT_TMPDIR=\\\"$TERMUX_PREFIX/tmp\\\"" - # Handle issue with too deep folder under Docker: # https://github.com/moby/moby/issues/13451 # https://bugzilla.yoctoproject.org/show_bug.cgi?id=7338 diff --git a/packages/coreutils/debug.patch b/packages/coreutils/debug.patch new file mode 100644 index 00000000..d458efc6 --- /dev/null +++ b/packages/coreutils/debug.patch @@ -0,0 +1,14 @@ +diff -u -r ../coreutils-8.27/src/du.c ./src/du.c +--- ../coreutils-8.27/src/du.c 2017-01-10 00:32:46.000000000 +0100 ++++ ./src/du.c 2017-07-02 22:09:36.164133594 +0200 +@@ -396,6 +396,10 @@ + print_only_size (uintmax_t n_bytes) + { + char buf[LONGEST_HUMAN_READABLE + 1]; ++ char* out = human_readable (n_bytes, buf, human_output_opts, 1, output_block_size); ++ fputs("NICE\n", stdout); ++ printf("NICE\n"); ++ printf("output=%s\n", human_readable (n_bytes, buf, human_output_opts, 1, output_block_size)); + fputs ((n_bytes == UINTMAX_MAX + ? _("Infinity") + : human_readable (n_bytes, buf, human_output_opts, diff --git a/packages/coreutils/src-sort.c.patch b/packages/coreutils/src-sort.c.patch new file mode 100644 index 00000000..49eef412 --- /dev/null +++ b/packages/coreutils/src-sort.c.patch @@ -0,0 +1,12 @@ +diff -u -r ../coreutils-8.27/src/sort.c ./src/sort.c +--- ../coreutils-8.27/src/sort.c 2017-01-01 23:34:24.000000000 +0100 ++++ ./src/sort.c 2017-07-02 23:32:35.261252848 +0200 +@@ -101,7 +101,7 @@ + #endif + + #ifndef DEFAULT_TMPDIR +-# define DEFAULT_TMPDIR "/tmp" ++# define DEFAULT_TMPDIR "@TERMUX_PREFIX@/tmp" + #endif + + /* Maximum number of lines to merge every time a NODE is taken from diff --git a/packages/coreutils/src-tac.c.patch b/packages/coreutils/src-tac.c.patch new file mode 100644 index 00000000..86ff8a6d --- /dev/null +++ b/packages/coreutils/src-tac.c.patch @@ -0,0 +1,12 @@ +diff -u -r ../coreutils-8.27/src/tac.c ./src/tac.c +--- ../coreutils-8.27/src/tac.c 2017-02-18 04:18:29.000000000 +0100 ++++ ./src/tac.c 2017-07-02 23:32:45.765137258 +0200 +@@ -67,7 +67,7 @@ + + + #ifndef DEFAULT_TMPDIR +-# define DEFAULT_TMPDIR "/tmp" ++# define DEFAULT_TMPDIR "@TERMUX_PREFIX@/tmp" + #endif + + /* The number of bytes per atomic read. */