From e4ba46a8fe1fbe2057f81b880c85bec3bf99343c Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 3 May 2016 00:40:17 +0200 Subject: [PATCH] Move $PREFIX/bin/env from coreutils to busybox The busybox version of env should provide enough functionality, and having $PREFIX/bin/env available out of the box is valuable. --- packages/busybox/build.sh | 9 ++++++--- packages/coreutils/build.sh | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index dce90ed2a..6c2fab07d 100755 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.busybox.net/ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_VERSION=1.24.2 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_BUILD_REVISION=2 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_BUILD_IN_SRC=yes +# We replace env in the old coreutils package: +TERMUX_PKG_CONFLICTS="coreutils (< 8.25-4)" # NOTE: sed on mac does not work for building busybox, install gsed and symlink sed => gsed @@ -31,9 +33,10 @@ termux_step_post_make_install () { cd $TERMUX_PREFIX/bin/applets for f in `cat $TERMUX_PKG_SRCDIR/busybox.links`; do ln -s ../busybox `basename $f`; done + # The 'ash' and 'env' applets are special in that they go into $PREFIX/bin: cd $TERMUX_PREFIX/bin - rm -f ash - ln -s busybox ash + ln -f -s busybox ash + ln -f -s busybox env # Install busybox man page mkdir -p $TERMUX_PREFIX/share/man/man1 diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh index 371d63d08..f321861d5 100755 --- a/packages/coreutils/build.sh +++ b/packages/coreutils/build.sh @@ -1,13 +1,14 @@ 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=3 +TERMUX_PKG_BUILD_REVISION=4 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, let busybox version prevail. # df does not work either, let system binary prevail. -TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-no-install-program=pinky,realpath,df,chroot" +# $PREFIX/bin/env is provided by busybox for shebangs to work directly. +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-no-install-program=pinky,realpath,df,chroot,env" 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: