diff options
| author | joerg <joerg> | 2015-04-21 17:01:55 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-04-21 17:01:55 +0000 |
| commit | ad96cd8a6c444244b0c4ba965d5c6b97994bae41 (patch) | |
| tree | b96ffd56a8517f5545b97d972b4634bc98c97669 /mk/pkgformat | |
| parent | 5303e7481e6999874551c38c4d62ecf130b12a33 (diff) | |
| download | pkgsrc-ad96cd8a6c444244b0c4ba965d5c6b97994bae41.tar.gz | |
Add a new ulimit modifier for cputime. Support raising limits for
package creation.
There are very few things in pkgsrc that needs more than one hour per
process on decently fast hardware, so setting that as (soft) limit for
bulk builds avoids the infinite loops seen in some other packages. There
are a few select exceptions, i.e. flightgear-data needs more than one
hour for pkg_create when using xz. This flag allows selectively giving
those places more time without wasting resources in the broken cases.
Diffstat (limited to 'mk/pkgformat')
| -rw-r--r-- | mk/pkgformat/pkg/package.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/pkgformat/pkg/package.mk b/mk/pkgformat/pkg/package.mk index 9247c9471c1..0de336e6e24 100644 --- a/mk/pkgformat/pkg/package.mk +++ b/mk/pkgformat/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.9 2015/02/16 10:50:33 jperkin Exp $ +# $NetBSD: package.mk,v 1.10 2015/04/21 17:01:56 joerg Exp $ .if defined(PKG_SUFX) WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION" @@ -72,7 +72,7 @@ _PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP} ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS} ${RUN} ${MKDIR} ${.TARGET:H} @${STEP_MSG} "Creating binary package ${.TARGET}" - ${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \ + ${RUN} ${_ULIMIT_CMD} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \ if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then \ ${MV} -f "$$tmpname" ${.TARGET}; \ else \ |