pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/bash bash: Disable bash-malloc on Linux with mu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/342a988e7c5d
branches:  trunk
changeset: 414395:342a988e7c5d
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Mar 26 15:06:58 2020 +0000

description:
bash: Disable bash-malloc on Linux with musl libc

from Michael Forney

diffstat:

 shells/bash/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 76f7b611de9f -r 342a988e7c5d shells/bash/Makefile
--- a/shells/bash/Makefile      Thu Mar 26 14:48:36 2020 +0000
+++ b/shells/bash/Makefile      Thu Mar 26 15:06:58 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2020/02/11 11:45:25 kre Exp $
+# $NetBSD: Makefile,v 1.93 2020/03/26 15:06:58 nia Exp $
 
 BASH_VERSION=          5.0
 BASH_PATCHLEVEL=       16
@@ -53,14 +53,17 @@
 .include "options.mk"
 
 # Minix lacks setpgid() which is needed for job control.
-# bash malloc() is also broken on Minix
 .if ${OPSYS} == "Minix"
 CONFIGURE_ARGS+=       --disable-job-control
-CONFIGURE_ARGS+=       --with-bash-malloc=no
 .else
 CONFIGURE_ARGS+=       --enable-job-control
 .endif
 
+# bash malloc() is broken on Minix and musl libc
+.if ${OPSYS} == "Minix" || (${OPSYS} == "Linux" && empty(GLIBC_VERSION))
+CONFIGURE_ARGS+=       --with-bash-malloc=no
+.endif
+
 # Use "readline" package on Darwin to avoid link erros.
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=               --with-installed-readline



Home | Main Index | Thread Index | Old Index