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.
This commit is contained in:
Fredrik Fornwall 2016-05-03 00:40:17 +02:00
parent fb2c62d7b8
commit e4ba46a8fe
2 changed files with 9 additions and 5 deletions

View File

@ -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

View File

@ -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: