From f5fc3dfdb5f19262aef20494aff4d00deaafefcb Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 24 Apr 2019 11:34:05 +0200 Subject: [PATCH] coreutils: Update from 8.30 to 8.31 --- packages/coreutils/build.sh | 7 +++-- packages/coreutils/configure.patch | 31 ++++++------------- packages/coreutils/lib-stdio-impl.h.patch | 12 ------- .../termux_step_configure_autotools.sh | 1 + 4 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 packages/coreutils/lib-stdio-impl.h.patch diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh index 7ee803590..0e897fead 100644 --- a/packages/coreutils/build.sh +++ b/packages/coreutils/build.sh @@ -1,9 +1,8 @@ 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_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=8.30 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057 +TERMUX_PKG_VERSION=8.31 +TERMUX_PKG_SHA256=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz # pinky has no usage on Android. # df does not work either, let system binary prevail. @@ -12,6 +11,7 @@ TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PK # uptime is provided by procps. TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" gl_cv_host_operating_system=Android +ac_cv_func_getpass=yes --disable-xattr --enable-no-install-program=pinky,df,chroot,env,users,who,uptime --enable-single-binary=symlinks @@ -20,4 +20,5 @@ gl_cv_host_operating_system=Android termux_step_pre_configure() { CPPFLAGS+=" -DDEFAULT_TMPDIR=\\\"$TERMUX_PREFIX/tmp\\\"" + CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0" } diff --git a/packages/coreutils/configure.patch b/packages/coreutils/configure.patch index 545cf57f3..880d5c8a5 100644 --- a/packages/coreutils/configure.patch +++ b/packages/coreutils/configure.patch @@ -1,25 +1,12 @@ -diff -r -u ../coreutils-8.22/configure ./configure ---- ../coreutils-8.22/configure 2013-12-13 16:05:30.000000000 +0100 -+++ ./configure 2014-02-12 18:21:28.000000000 +0100 -@@ -39537,7 +39537,7 @@ +diff -u -r ../coreutils-8.31/configure ./configure +--- ../coreutils-8.31/configure 2019-03-10 23:35:43.000000000 +0000 ++++ ./configure 2019-04-18 14:08:40.316645642 +0000 +@@ -43326,7 +43326,7 @@ - # Determine how to get the list of mounted file systems. --ac_list_mounted_fs= -+ac_list_mounted_fs=found + # Determine how to get the list of mounted file systems. +- ac_list_mounted_fs= ++ ac_list_mounted_fs=found - # If the getmntent function is available but not in the standard library, - # make sure LIBS contains the appropriate -l option. -@@ -40077,12 +40077,6 @@ - esac - fi - --if test -z "$ac_list_mounted_fs"; then -- as_fn_error $? "could not determine how to read list of mounted file systems" "$LINENO" 5 -- # FIXME -- no need to abort building the whole package -- # Can't build mountlist.c or anything that needs its functions --fi -- - if test $ac_list_mounted_fs = found; then : - gl_cv_list_mounted_fs=yes - else + # If the getmntent function is available but not in the standard library, + # make sure LIBS contains the appropriate -l option. diff --git a/packages/coreutils/lib-stdio-impl.h.patch b/packages/coreutils/lib-stdio-impl.h.patch deleted file mode 100644 index d3bfbd53a..000000000 --- a/packages/coreutils/lib-stdio-impl.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../coreutils-8.30/lib/stdio-impl.h ./lib/stdio-impl.h ---- ../coreutils-8.30/lib/stdio-impl.h 2018-06-24 06:52:06.000000000 +0200 -+++ ./lib/stdio-impl.h 2018-07-03 11:05:27.353619181 +0200 -@@ -60,7 +60,7 @@ - # define _flags pub._flags - # define _r pub._r - # define _w pub._w --# elif defined __ANDROID__ /* Android */ -+# elif defined __ANDROID_BUT_THIS_IS_BROKEN__ /* Android */ - /* Up to this commit from 2015-10-12 - - the innards of FILE were public, and fp_ub could be defined like for OpenBSD, diff --git a/scripts/build/configure/termux_step_configure_autotools.sh b/scripts/build/configure/termux_step_configure_autotools.sh index 42232ea54..233ac9ce2 100644 --- a/scripts/build/configure/termux_step_configure_autotools.sh +++ b/scripts/build/configure/termux_step_configure_autotools.sh @@ -78,6 +78,7 @@ termux_step_configure_autotools() { AVOID_GNULIB+=" gl_cv_func_stat_dir_slash=yes" AVOID_GNULIB+=" gl_cv_func_stat_file_slash=yes" AVOID_GNULIB+=" gl_cv_func_strerror_0_works=yes" + AVOID_GNULIB+=" gl_cv_func_strtold_works=yes" AVOID_GNULIB+=" gl_cv_func_symlink_works=yes" AVOID_GNULIB+=" gl_cv_func_tzset_clobber=no" AVOID_GNULIB+=" gl_cv_func_unlink_honors_slashes=yes"