aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Daniel Sabogal <dsabogalcc@gmail.com>2017-05-23 13:19:31 -0400
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-06-01 16:43:59 +0200
commita3f1167c5d908a3ed477645047306bd01b7f5a65 (patch)
tree7cc546a6560e93630b99c7e7981f64198452617e
parent15391f30f7b302b2cf8263d9f132814cfb56f563 (diff)
downloadbuildroot-a3f1167c5d908a3ed477645047306bd01b7f5a65.tar.gz
buildroot-a3f1167c5d908a3ed477645047306bd01b7f5a65.tar.bz2
bash: disable bash malloc by default
Bash's malloc relies on sbrk which is implemented as a fail-only stub in musl. Presently, it is disabled when configured for static libs. Instead, default to using libc malloc. Fixes: # bash bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated) Signed-off-by: Daniel Sabogal <dsabogalcc@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (cherry picked from commit 43552504c8aacda2a163c933203a3b77146409c1) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/bash/bash.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 090cf5224c..0f42fd16f7 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -9,7 +9,7 @@ BASH_SITE = $(BR2_GNU_MIRROR)/bash
# Build after since bash is better than busybox shells
BASH_DEPENDENCIES = ncurses readline host-bison \
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
-BASH_CONF_OPTS = --with-installed-readline
+BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc
BASH_LICENSE = GPLv3+
BASH_LICENSE_FILES = COPYING
@@ -24,7 +24,7 @@ BASH_CONF_ENV += \
# The static build needs some trickery
ifeq ($(BR2_STATIC_LIBS),y)
-BASH_CONF_OPTS += --enable-static-link --without-bash-malloc
+BASH_CONF_OPTS += --enable-static-link
# bash wants to redefine the getenv() function. To check whether this is
# possible, AC_TRY_RUN is used which is not possible in
# cross-compilation.