Received: by mail.netbsd.org (Postfix, from userid 605) id 4F9EF84D59; Thu, 26 Mar 2020 15:07:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CB84484D57 for ; Thu, 26 Mar 2020 15:06:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ZtOt3jHwKVw2 for ; Thu, 26 Mar 2020 15:06:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2E6DF84D2C for ; Thu, 26 Mar 2020 15:06:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 27F46FB27; Thu, 26 Mar 2020 15:06:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585235219139650" MIME-Version: 1.0 Date: Thu, 26 Mar 2020 15:06:59 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/shells/bash To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200326150659.27F46FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1585235219139650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1585235219139650 Content-Disposition: inline Content-Length: 1069 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1585235219139650--