Mercurial > vanilla
changeset 129:f55c9ef41a9a
vanilla: multiple fixes
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sun, 10 Mar 2019 16:16:54 +0100 |
| parents | fbebcfd7991c |
| children | 140a5a5253f9 |
| files | core/lvm2/lvm2.info core/lvm2/lvm2.sh core/util-linux/util-linux.info core/util-linux/util-linux.sh |
| diffstat | 4 files changed, 17 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/core/lvm2/lvm2.info Sun Mar 10 15:47:44 2019 +0100 +++ b/core/lvm2/lvm2.info Sun Mar 10 16:16:54 2019 +0100 @@ -21,10 +21,3 @@ PKGLICENSE="GPLv2 LGPLv21" PKGSUMMARY="LVM utilities" PKGDOWNLOAD="https://mirrors.kernel.org/sourceware/$PKGNAME/LVM2.$PKGVERSION.tgz" -PKGOPTIONS="NLS" - -: ${NLS:=yes} - -if [ "$NLS" = "yes" ]; then - PKGDEPENDS="core/gettext $PKGDEPENDS" -fi
--- a/core/lvm2/lvm2.sh Sun Mar 10 15:47:44 2019 +0100 +++ b/core/lvm2/lvm2.sh Sun Mar 10 16:16:54 2019 +0100 @@ -28,24 +28,19 @@ tar xvaf LVM2.$PKGVERSION.tgz pushd LVM2.$PKGVERSION -if [ "$NLS" = "yes" ]; then - with_nls="--enable-nls" -else - with_nls="--disable-nls" -fi - patch -p0 < ../musl.patch CC="$CC" \ CFLAGS="$CFLAGS" \ +LIBS="$LIBS" \ ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --disable-readline \ + --disable-nls \ --enable-pkgconfig \ --enable-udev_rules \ - --enable-udev_sync \ - ${with_nls} + --enable-udev_sync make make install DESTDIR=$DESTDIR
--- a/core/util-linux/util-linux.info Sun Mar 10 15:47:44 2019 +0100 +++ b/core/util-linux/util-linux.info Sun Mar 10 16:16:54 2019 +0100 @@ -23,9 +23,9 @@ PKGDOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.33/$PKGNAME-$PKGVERSION.tar.xz" PKGOPTIONS="BASHCMP NLS PYTHON" -if [ "${NLS:-yes}" = "yes" ]; then +if [ "$NLS" = "yes" ]; then PKGDEPENDS="core/gettext $PKGDEPENDS" fi -if [ "${PYTHON:-yes}" = "yes" ]; then +if [ "$PYTHON" = "yes" ]; then PKGDEPENDS="python/python $PKGDEPENDS" fi
--- 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