diff options
author | seb <seb@pkgsrc.org> | 2002-08-28 11:06:17 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-08-28 11:06:17 +0000 |
commit | 9a2cbf0ab0c3932effb25bf18d0e0bd146744dcb (patch) | |
tree | 75efa29b414c62f586837a52fa4ffc0196db8f5b /mk | |
parent | 8b2d3c7f707b7cff7b9de3a7b400463844c70643 (diff) | |
download | pkgsrc-9a2cbf0ab0c3932effb25bf18d0e0bd146744dcb.tar.gz |
Allow more flexibility in the handling of UNLIMIT_RESOURCES.
Each word of UNLIMIT_RESOURCES is supposed to be a knob on
ULIMIT_CMD_<word> variable which value if defined is added to _ULIMIT_CMD.
The ULIMIT_CMD_* variables are set per $OPSYS in defs.*.mk and are overridable
by the user.
Solaris' default value of ULIMIT_CMD_memorysize adjusted as suggested in PR
pkg/18087 by Jonathan Perkin <sketch@rd.bbc.co.uk>.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 16 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 5 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 5 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 5 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 5 |
5 files changed, 22 insertions, 14 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 14047e87097..9ca7a9c80d3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1037 2002/08/27 17:35:02 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1038 2002/08/28 11:06:17 seb Exp $ # # This file is in the public domain. # @@ -313,15 +313,11 @@ MAKE_ENV+= FC="${FC}" # Automatically increase process limit where necessary for building. _ULIMIT_CMD= .if defined(UNLIMIT_RESOURCES) -. if ${UNLIMIT_RESOURCES:Mdatasize} != "" -_ULIMIT_CMD+= ulimit -d `ulimit -H -d`; -. endif -. if ${UNLIMIT_RESOURCES:Mstacksize} != "" -_ULIMIT_CMD+= ulimit -s `ulimit -H -s`; -. endif -. if ${UNLIMIT_RESOURCES:Mmemorysize} != "" -_ULIMIT_CMD+= ulimit -m `ulimit -H -m`; -. endif +. for __tmp__ in ${UNLIMIT_RESOURCES} +. if defined(ULIMIT_CMD_${__tmp__}) +_ULIMIT_CMD+= ${ULIMIT_CMD_${__tmp__}} ; +. endif +. endfor .endif # -lintl in CONFIGURE_ENV is to workaround broken gettext.m4 diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 1a40f81ef54..4d8eda806bd 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.26 2002/07/15 16:24:01 schmonz Exp $ +# $NetBSD: defs.Darwin.mk,v 1.27 2002/08/28 11:06:18 seb Exp $ # # Variable definitions for the Darwin operating system. @@ -67,6 +67,9 @@ ROOT_CMD?= sudo sh -c ROOT_GROUP?= wheel ROOT_USER?= root SERIAL_DEVICES?= /dev/null +ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` +ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` +ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` USERADD?= ${FALSE} # XXX - Fix me! ZOULARISBASE?= ${LOCALBASE} diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index a290700bc0f..c12cf48f093 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.28 2002/07/15 16:24:01 schmonz Exp $ +# $NetBSD: defs.Linux.mk,v 1.29 2002/08/28 11:06:18 seb Exp $ # # Variable definitions for the Linux operating system. @@ -71,6 +71,9 @@ ROOT_CMD?= ${SU} - root -c ROOT_GROUP?= wheel ROOT_USER?= root SERIAL_DEVICES?= /dev/null +ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` +ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` +ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` USERADD?= /usr/sbin/useradd ZOULARISBASE?= /usr/pkg diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 22858ad447d..eb8ff210eb5 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.26 2002/07/15 16:24:01 schmonz Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.27 2002/08/28 11:06:19 seb Exp $ # # Variable definitions for the NetBSD operating system. @@ -75,6 +75,9 @@ PKG_TOOLS_BIN?= /usr/sbin ROOT_CMD?= ${SU} - root -c ROOT_USER?= root ROOT_GROUP?= wheel +ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` +ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` +ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index d19affcea5d..6a23849ddd0 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.26 2002/07/15 16:24:01 schmonz Exp $ +# $NetBSD: defs.SunOS.mk,v 1.27 2002/08/28 11:06:19 seb Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -78,6 +78,9 @@ ROOT_CMD?= ${SU} - root -c ROOT_GROUP?= root ROOT_USER?= root SERIAL_DEVICES?= /dev/null +ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` +ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` +ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v` USERADD?= /usr/sbin/useradd _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl |