Thu Mar 26 15:06:59 2020 UTC ()
bash: Disable bash-malloc on Linux with musl libc

from Michael Forney


(nia)
diff -r1.92 -r1.93 pkgsrc/shells/bash/Makefile
cvs diff -r1.92 -r1.93 pkgsrc/shells/bash/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/bash/Makefile 2020/02/11 11:45:25 1.92
+++ pkgsrc/shells/bash/Makefile 2020/03/26 15:06:58 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.92 2020/02/11 11:45:25 kre Exp $ 1# $NetBSD: Makefile,v 1.93 2020/03/26 15:06:58 nia Exp $
2 2
3BASH_VERSION= 5.0 3BASH_VERSION= 5.0
4BASH_PATCHLEVEL= 16 4BASH_PATCHLEVEL= 16
5 5
6DISTNAME= bash-${BASH_VERSION} 6DISTNAME= bash-${BASH_VERSION}
7PKGNAME= bash-${BASH_VERSION:C/4\.4\..*/4.4/}.${BASH_PATCHLEVEL} 7PKGNAME= bash-${BASH_VERSION:C/4\.4\..*/4.4/}.${BASH_PATCHLEVEL}
8PKGREVISION= 1 8PKGREVISION= 1
9CATEGORIES= shells 9CATEGORIES= shells
10MASTER_SITES= ${MASTER_SITE_GNU:=bash/} 10MASTER_SITES= ${MASTER_SITE_GNU:=bash/}
11 11
12PATCH_SITES= ${MASTER_SITES:=bash-5.0-patches/} 12PATCH_SITES= ${MASTER_SITES:=bash-5.0-patches/}
13PATCHFILES+= bash50-001 bash50-002 bash50-003 bash50-004 bash50-005 13PATCHFILES+= bash50-001 bash50-002 bash50-003 bash50-004 bash50-005
14PATCHFILES+= bash50-006 bash50-007 bash50-008 bash50-009 bash50-010 14PATCHFILES+= bash50-006 bash50-007 bash50-008 bash50-009 bash50-010
@@ -43,34 +43,37 @@ CONFIGURE_ARGS+= --enable-help-builtin @@ -43,34 +43,37 @@ CONFIGURE_ARGS+= --enable-help-builtin
43CONFIGURE_ARGS+= --enable-extended-glob 43CONFIGURE_ARGS+= --enable-extended-glob
44CONFIGURE_ARGS+= --enable-dparen-arithmetic 44CONFIGURE_ARGS+= --enable-dparen-arithmetic
45CONFIGURE_ARGS+= --enable-directory-stack 45CONFIGURE_ARGS+= --enable-directory-stack
46CONFIGURE_ARGS+= --enable-debugger 46CONFIGURE_ARGS+= --enable-debugger
47CONFIGURE_ARGS+= --enable-cond-regexp 47CONFIGURE_ARGS+= --enable-cond-regexp
48CONFIGURE_ARGS+= --enable-alias 48CONFIGURE_ARGS+= --enable-alias
49CONFIGURE_ARGS+= --enable-brace-expansion 49CONFIGURE_ARGS+= --enable-brace-expansion
50CONFIGURE_ARGS+= --enable-array-variables 50CONFIGURE_ARGS+= --enable-array-variables
51 51
52.include "../../mk/bsd.prefs.mk" 52.include "../../mk/bsd.prefs.mk"
53.include "options.mk" 53.include "options.mk"
54 54
55# Minix lacks setpgid() which is needed for job control. 55# Minix lacks setpgid() which is needed for job control.
56# bash malloc() is also broken on Minix 
57.if ${OPSYS} == "Minix" 56.if ${OPSYS} == "Minix"
58CONFIGURE_ARGS+= --disable-job-control 57CONFIGURE_ARGS+= --disable-job-control
59CONFIGURE_ARGS+= --with-bash-malloc=no 
60.else 58.else
61CONFIGURE_ARGS+= --enable-job-control 59CONFIGURE_ARGS+= --enable-job-control
62.endif 60.endif
63 61
 62# bash malloc() is broken on Minix and musl libc
 63.if ${OPSYS} == "Minix" || (${OPSYS} == "Linux" && empty(GLIBC_VERSION))
 64CONFIGURE_ARGS+= --with-bash-malloc=no
 65.endif
 66
64# Use "readline" package on Darwin to avoid link erros. 67# Use "readline" package on Darwin to avoid link erros.
65.if ${OPSYS} == "Darwin" 68.if ${OPSYS} == "Darwin"
66CONFIGURE_ARGS+= --with-installed-readline 69CONFIGURE_ARGS+= --with-installed-readline
67 70
68BUILDLINK_API_DEPENDS.readline+= readline>=7.0 71BUILDLINK_API_DEPENDS.readline+= readline>=7.0
69.include "../../devel/readline/buildlink3.mk" 72.include "../../devel/readline/buildlink3.mk"
70.endif 73.endif
71 74
72.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD" 75.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
73CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 76CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
74CONFIGURE_ENV+= ac_cv_c_long_long=yes 77CONFIGURE_ENV+= ac_cv_c_long_long=yes
75CONFIGURE_ENV+= ac_cv_c_long_double=yes 78CONFIGURE_ENV+= ac_cv_c_long_double=yes
76CONFIGURE_ENV+= bash_cv_type_rlimit=yes 79CONFIGURE_ENV+= bash_cv_type_rlimit=yes