PR/45042: Thomas Cort: Minix support: handle missing setpgid and setrlimit

3 files changed, 12 insertions, 8 deletions

diff --git a/devel/bmake/files/configure.in b/devel/bmake/files/configure.in
index 50001c07e76..9cdfd330265 100644
--- a/devel/bmake/files/configure.in
+++ b/devel/bmake/files/configure.in
@@ -1,6 +1,6 @@
 dnl
 dnl RCSid:
-dnl	$Id: configure.in,v 1.11 2011/06/18 22:39:46 bsiegert Exp $
+dnl	$Id: configure.in,v 1.12 2013/02/26 00:50:14 christos Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
@@ -143,6 +143,8 @@ AC_CHECK_FUNCS( \
 	putenv \
 	select \
 	setenv \
+	setpgid \
+	setrlimit \
 	sigaction \
 	sigvec \
 	snprintf \
diff --git a/devel/bmake/files/job.c b/devel/bmake/files/job.c
index 5582d8ea90e..919f758b1d4 100644
--- a/devel/bmake/files/job.c
+++ b/devel/bmake/files/job.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: job.c,v 1.12 2011/06/18 22:39:46 bsiegert Exp $	*/
+/*	$NetBSD: job.c,v 1.13 2013/02/26 00:50:14 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.12 2011/06/18 22:39:46 bsiegert Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.13 2013/02/26 00:50:14 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.12 2011/06/18 22:39:46 bsiegert Exp $");
+__RCSID("$NetBSD: job.c,v 1.13 2013/02/26 00:50:14 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1396,12 +1396,14 @@ JobExec(Job *job, char **argv)
 	 * we can kill it and all its descendants in one fell swoop,
 	 * by killing its process family, but not commit suicide.
 	 */
+#if defined(MAKE_NATIVE) || defined(HAVE_SETPGID)
 #if defined(SYSV)
 	/* XXX: dsl - I'm sure this should be setpgrp()... */
 	(void)setsid();
 #else
 	(void)setpgid(0, getpid());
 #endif
+#endif
 
 	Var_ExportVars();
 
diff --git a/devel/bmake/files/main.c b/devel/bmake/files/main.c
index 77f6be89c5f..e157f8cdc14 100644
--- a/devel/bmake/files/main.c
+++ b/devel/bmake/files/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.11 2011/06/18 22:39:46 bsiegert Exp $	*/
+/*	$NetBSD: main.c,v 1.12 2013/02/26 00:50:14 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.11 2011/06/18 22:39:46 bsiegert Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.12 2013/02/26 00:50:14 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.11 2011/06/18 22:39:46 bsiegert Exp $");
+__RCSID("$NetBSD: main.c,v 1.12 2013/02/26 00:50:14 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -832,7 +832,7 @@ main(int argc, char **argv)
 		progname++;
 	else
 		progname = argv[0];
-#ifdef RLIMIT_NOFILE
+#if defined(MAKE_NATIVE) || (defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE))
 	/*
 	 * get rid of resource limit on file descriptors
 	 */