diff options
| author | tcort <tcort> | 2013-02-12 23:31:40 +0000 |
|---|---|---|
| committer | tcort <tcort> | 2013-02-12 23:31:40 +0000 |
| commit | 982037dcc15891943198e5847e9fc763e817a965 (patch) | |
| tree | 5481c8fdabd9e9acdcb1d6972066155fcfa38013 /shells/bash | |
| parent | 7ac5619344437d03788ab7302cbb2bf2426ec6f5 (diff) | |
| download | pkgsrc-982037dcc15891943198e5847e9fc763e817a965.tar.gz | |
shells/bash: disable job control on Minix
OK by wiz
Diffstat (limited to 'shells/bash')
| -rw-r--r-- | shells/bash/Makefile | 12 | ||||
| -rw-r--r-- | shells/bash/distinfo | 3 | ||||
| -rw-r--r-- | shells/bash/patches/patch-execute_cmd.c | 31 |
3 files changed, 43 insertions, 3 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index e999f946245..9dd13c16d5d 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2012/09/11 23:25:07 asau Exp $ +# $NetBSD: Makefile,v 1.56 2013/02/12 23:31:40 tcort Exp $ BASH_VERSION= 4.2 @@ -39,7 +39,6 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1 CONFIGURE_ARGS+= --enable-readline CONFIGURE_ARGS+= --enable-progcomp CONFIGURE_ARGS+= --enable-process-substitution -CONFIGURE_ARGS+= --enable-job-control CONFIGURE_ARGS+= --enable-history CONFIGURE_ARGS+= --enable-help-builtin CONFIGURE_ARGS+= --enable-extended-glob @@ -67,6 +66,15 @@ BUILDLINK_DEPMETHOD.gettext= build BUILDLINK_DEPMETHOD.readline= build .endif +# 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 + # Use "readline" package on Darwin to avoid link erros. .if ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --with-installed-readline diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 7be54aea22f..2c799e7d390 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2012/07/18 15:43:10 spz Exp $ +$NetBSD: distinfo,v 1.26 2013/02/12 23:31:40 tcort Exp $ SHA1 (bash-4.2.tar.gz) = 487840ab7134eb7901fbb2e49b0ee3d22de15cb8 RMD160 (bash-4.2.tar.gz) = df7ae51783f039a1234d3b720ffcf4bfa5d09673 @@ -8,4 +8,5 @@ SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-ai) = 26825922898567841bed0bf62a8dee3bcc50cd75 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e SHA1 (patch-ak) = 6dfb7195f45f81064f687a4c9febb9dcae721aa7 +SHA1 (patch-execute_cmd.c) = ce9fe5820188aa218bac74316d45cbdabadb1785 SHA1 (patch-lib_sh_eaccess.c) = 484577f09efe67f604c3fb85afdb5a58b64f5b6c diff --git a/shells/bash/patches/patch-execute_cmd.c b/shells/bash/patches/patch-execute_cmd.c new file mode 100644 index 00000000000..d3c6271eaf4 --- /dev/null +++ b/shells/bash/patches/patch-execute_cmd.c @@ -0,0 +1,31 @@ +$NetBSD: patch-execute_cmd.c,v 1.1 2013/02/12 23:31:41 tcort Exp $ + +Allow bash to compile with JOB_CONTROL disabled. + +http://ftp.gnu.org/gnu/bash/bash-4.2-patches/bash42-018 + +--- execute_cmd.c.orig Wed Feb 9 22:32:25 2011 ++++ execute_cmd.c Tue Feb 12 11:48:00 2013 +@@ -2196,6 +2196,7 @@ + if (ignore_return && cmd) + cmd->flags |= CMD_IGNORE_RETURN; + ++#if defined (JOB_CONTROL) + lastpipe_flag = 0; + begin_unwind_frame ("lastpipe-exec"); + lstdin = -1; +@@ -2219,11 +2220,14 @@ + } + if (prev >= 0) + add_unwind_protect (close, prev); ++#endif + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + ++#if defined (JOB_CONTROL) + if (lstdin > 0) + restore_stdin (lstdin); ++#endif + + if (prev >= 0) + close (prev); |