Mercurial > vanilla
changeset 79:445da18130da
core/bash: add NLS option
author | David Demelier <markand@malikania.fr> |
---|---|
date | Thu, 07 Mar 2019 13:37:47 +0100 |
parents | b82a6c62f488 |
children | 04f5776ff0be |
files | core/bash/bash.info core/bash/bash.sh |
diffstat | 2 files changed, 24 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/core/bash/bash.info Thu Mar 07 13:36:02 2019 +0100 +++ b/core/bash/bash.info Thu Mar 07 13:37:47 2019 +0100 @@ -21,3 +21,8 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="bourne again shell" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGOPTIONS="NLS" + +if [ "${NLS:-yes}" = "yes" ]; then + PKGDEPENDS="core/gettext $PKGDEPENDS" +fi
--- a/core/bash/bash.sh Thu Mar 07 13:36:02 2019 +0100 +++ b/core/bash/bash.sh Thu Mar 07 13:37:47 2019 +0100 @@ -15,24 +15,33 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # +: ${CHOST:=$(uname -m)-linux-musl} +: ${CBUILD:=$(uname -m)-linux-musl} +: ${CC:=gcc} +: ${CFLAGS:=-O2} + source ./bash.info -case $(uname -m) in -x86_64) - CFLAGS="-O2 -fPIC" - ;; -*) - CFLAGS="-O2" - ;; -esac +set -ex -set -e +if [ "${NLS:-yes}" = "no" ]; then + with_nls="--disable-nls" +else + with_nls="--enable-nls" +fi rm -rf $PKGNAME-$PKGVERSION tar xvaf $PKGNAME-$PKGVERSION.tar.gz pushd $PKGNAME-$PKGVERSION -CFLAGS="$CFLAGS" ./configure --prefix=/usr +CC="$CC" \ +CFLAGS="$CFLAGS" \ +./configure \ + --build=${CBUILD} \ + --host=${CHOST} \ + --prefix=/usr \ + --without-bash-malloc \ + ${with_nls} make make install DESTDIR=$DESTDIR