Thu Mar 26 12:23:54 2020 UTC ()
mk: Support undefined UNLIMIT_RESOURCES.

Currently virtualsize is only defined for NetBSD, breaking builds that use it
on any other platform.  Adding defaults for all other platforms should be done
at some point, this at least unbreaks package builds for now and provides a
safer default for any future additions.


(jperkin)
diff -r1.2035 -r1.2036 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.2035 -r1.2036 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2020/02/09 22:39:20 1.2035
+++ pkgsrc/mk/bsd.pkg.mk 2020/03/26 12:23:54 1.2036
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.2035 2020/02/09 22:39:20 rillig Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.2036 2020/03/26 12:23:54 jperkin Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -221,27 +221,27 @@ _BUILD_DEFS+= PKG_OPTIONS @@ -221,27 +221,27 @@ _BUILD_DEFS+= PKG_OPTIONS
221.if defined(MULTI) 221.if defined(MULTI)
222_BUILD_DEFS+= MULTI 222_BUILD_DEFS+= MULTI
223.endif 223.endif
224 224
225# ZERO_FILESIZE_P exits with a successful return code if the given file 225# ZERO_FILESIZE_P exits with a successful return code if the given file
226# has zero length. 226# has zero length.
227# NONZERO_FILESIZE_P exits with a successful return code if the given file 227# NONZERO_FILESIZE_P exits with a successful return code if the given file
228# has nonzero length. 228# has nonzero length.
229# 229#
230_ZERO_FILESIZE_P= ${AWK} 'END { exit (NR > 0) ? 1 : 0; }' 230_ZERO_FILESIZE_P= ${AWK} 'END { exit (NR > 0) ? 1 : 0; }'
231_NONZERO_FILESIZE_P= ${AWK} 'END { exit (NR > 0) ? 0 : 1; }' 231_NONZERO_FILESIZE_P= ${AWK} 'END { exit (NR > 0) ? 0 : 1; }'
232 232
233# Automatically increase process limit where necessary for building. 233# Automatically increase process limit where necessary for building.
234_ULIMIT_CMD= ${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}};@} 234_ULIMIT_CMD= ${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}:U\:};@}
235 235
236_NULL_COOKIE= ${WRKDIR}/.null 236_NULL_COOKIE= ${WRKDIR}/.null
237 237
238# Miscellaneous overridable commands: 238# Miscellaneous overridable commands:
239SHCOMMENT?= ${ECHO_MSG} >/dev/null '***' 239SHCOMMENT?= ${ECHO_MSG} >/dev/null '***'
240 240
241LIBABISUFFIX?= 241LIBABISUFFIX?=
242 242
243TOUCH_FLAGS?= -f 243TOUCH_FLAGS?= -f
244 244
245# A few aliases for *-install targets 245# A few aliases for *-install targets
246INSTALL= ${TOOLS_INSTALL} # XXX override sys.mk 246INSTALL= ${TOOLS_INSTALL} # XXX override sys.mk
247INSTALL_PROGRAM?= \ 247INSTALL_PROGRAM?= \