CVS commit: pkgsrc/shells/bash

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 26 15:06:59 UTC 2020

Modified Files:
        pkgsrc/shells/bash: Makefile

Log Message:
bash: Disable bash-malloc on Linux with musl libc

from Michael Forney


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/shells/bash/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/bash/Makefile
diff -u pkgsrc/shells/bash/Makefile:1.92 pkgsrc/shells/bash/Makefile:1.93
--- pkgsrc/shells/bash/Makefile:1.92    Tue Feb 11 11:45:25 2020
+++ pkgsrc/shells/bash/Makefile Thu Mar 26 15:06:58 2020
@@ -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 @@ CONFIGURE_ARGS+=    --enable-array-variable
 .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