Mercurial > vanilla
diff core/util-linux/util-linux.sh @ 129:f55c9ef41a9a
vanilla: multiple fixes
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 10 Mar 2019 16:16:54 +0100 |
parents | 5511fb992e74 |
children | e737b80da269 |
line wrap: on
line diff
--- a/core/util-linux/util-linux.sh Sun Mar 10 15:47:44 2019 +0100 +++ b/core/util-linux/util-linux.sh Sun Mar 10 16:16:54 2019 +0100 @@ -19,25 +19,22 @@ : ${CBUILD:=$(uname -m)-linux-musl} : ${CC:=gcc} : ${CFLAGS:=-O2} +: ${NLS:=yes} +: ${PYTHON:=yes} source ./util-linux.info set -ex -if [ "${BASHCMP:-yes}" = "no" ]; then - with_bash="--disable-bash-completion" +if [ "$NLS" = "yes" ]; then + with_nls="--enable-nls" else - with_bash="--enable-bash-completion" -fi -if [ "${NLS:-yes}" = "no" ]; then with_nls="--disable-nls" +fi +if [ "$PYTHON" = "yes" ]; then + with_python="--with-python=3" else - with_nls="--enable-nls" -fi -if [ "${PYTHON:-yes}" = "no" ]; then with_python="--without-python" -else - with_python="--with-python=3" fi rm -rf $PKGNAME-$PKGVERSION @@ -49,16 +46,16 @@ ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --libdir=/usr/lib \ --bindir=/usr/bin \ - --sbindir=/usr/sbin \ --disable-static \ + --disable-su \ --enable-shared \ + --enable-usrdir-path \ --enable-vipw \ + --libdir=/usr/lib \ + --prefix=/usr \ + --sbindir=/usr/sbin \ --without-systemd \ - --enable-usrdir-path \ - ${with_bash} \ ${with_nls} \ ${with_python} make