From aa01a42bf5cabbabd84935e9e51d71a88ab196ac Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 7 Sep 2016 10:50:10 -0400 Subject: [PATCH] coreutils: Add back part of ls patch Fixes #441. --- packages/coreutils/build.sh | 2 +- packages/coreutils/src-ls.c.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 packages/coreutils/src-ls.c.patch diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh index 8098c486a..b0526376b 100755 --- a/packages/coreutils/build.sh +++ b/packages/coreutils/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/coreutils/ TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project" TERMUX_PKG_VERSION=8.25 -TERMUX_PKG_BUILD_REVISION=5 +TERMUX_PKG_BUILD_REVISION=6 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mkfifo=yes gl_cv_host_operating_system=Android --without-gmp --enable-single-binary=symlinks ac_cv_func_endpwent=no" # pinky has no usage on Android. diff --git a/packages/coreutils/src-ls.c.patch b/packages/coreutils/src-ls.c.patch new file mode 100644 index 000000000..989acb470 --- /dev/null +++ b/packages/coreutils/src-ls.c.patch @@ -0,0 +1,18 @@ +diff -u -r ../coreutils-8.22/src/ls.c ./src/ls.c +--- ../coreutils-8.22/src/ls.c 2013-12-04 15:48:30.000000000 +0100 ++++ ./src/ls.c 2014-02-14 16:11:48.000000000 +0100 +@@ -2098,11 +2089,13 @@ + } + } + ++#ifndef __ANDROID__ + /* Note we leave %5b etc. alone so user widths/flags are honored. */ + if (strstr (long_time_format[0], "%b") + || strstr (long_time_format[1], "%b")) + if (!abmon_init ()) + error (0, 0, _("error initializing month strings")); ++#endif + } + + return optind; +