# HG changeset patch # User David Demelier # Date 1551962267 -3600 # Node ID 445da18130dae684ddad4c2fb2f2d1f7a4a51af5 # Parent b82a6c62f488e0c8258ce1450edb66733db41314 core/bash: add NLS option diff -r b82a6c62f488 -r 445da18130da core/bash/bash.info --- 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 diff -r b82a6c62f488 -r 445da18130da core/bash/bash.sh --- 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