X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/25faa518f90fa8f3a168a9fc0d8e9215a55c77e8..63603681ca442dd4b1b3b01b24f94aea572ccf1e:/packages/coreutils/build.sh

diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh
index cda76fd7..0196334d 100755
--- a/packages/coreutils/build.sh
+++ b/packages/coreutils/build.sh
@@ -1,13 +1,36 @@
-TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/coreutils/
+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.24
-TERMUX_PKG_BUILD_REVISION=2
-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. realpath has permission denied problem with relative paths,
-# so let the busybox realpath remain in PATH:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="  --enable-no-install-program=pinky,realpath"
+TERMUX_PKG_VERSION=8.27
+TERMUX_PKG_REVISION=3
+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.
+# df does not work either, let system binary prevail.
+# $PREFIX/bin/env is provided by busybox for shebangs to work directly.
+# users and who doesn't work and does not make much sense for Termux.
+# uptime is provided by procps.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+gl_cv_host_operating_system=Android
+--enable-no-install-program=pinky,df,chroot,env,users,who,uptime
+--enable-single-binary=symlinks
+--without-gmp
+"
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="$TERMUX_PKG_EXTRA_CONFIGURE_ARGS"
 TERMUX_PKG_BUILD_IN_SRC=yes
 # Host build for man pages generated by help2man, see makefile.patch:
 TERMUX_PKG_HOSTBUILD=yes
+
+termux_step_pre_configure() {
+	# Handle issue with too deep folder under Docker:
+	# https://github.com/moby/moby/issues/13451
+	# https://bugzilla.yoctoproject.org/show_bug.cgi?id=7338
+	# From https://bugzilla.yoctoproject.org/show_bug.cgi?id=7338:
+	# When running in a Docker container, getcwd-path-max.m4 leaves behind
+	# a deeply-nested structure of confdir3/ directories that can't be deleted using rm -fr.
+	# See https://github.com/docker/docker/issues/13451
+	cd $TERMUX_PKG_HOSTBUILD_DIR
+	if [ -d confdir3/confdir3 ]; then
+		mv confdir3/confdir3/ fred/
+		rm -Rf fred/ confdir3/
+	fi
+}