tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: Set MAKE_JOBS_SAFE=no for samba?
On Wed, Jan 09, 2019 at 09:42:35AM -0500, Greg Troxel wrote:
> I think we've reached consensus if dholland@ is ok with PKGPATH
> instead. David: if so, I'd say commit away, and if not, could you
> explain why?
seems reasonable to me...
Index: mk/build/build.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/build/build.mk,v
retrieving revision 1.24
diff -u -r1.24 build.mk
--- mk/build/build.mk 30 Nov 2018 18:38:19 -0000 1.24
+++ mk/build/build.mk 12 Jan 2019 18:39:33 -0000
@@ -55,6 +55,8 @@
.if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
_MAKE_JOBS= # nothing
+.elif defined(MAKE_JOBS.${PKGPATH})
+_MAKE_JOBS= -j${MAKE_JOBS.${PKGPATH}}
.elif defined(MAKE_JOBS)
_MAKE_JOBS= -j${MAKE_JOBS}
.endif
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.299
diff -u -r1.299 mk.conf
--- mk/defaults/mk.conf 11 Jan 2019 23:09:15 -0000 1.299
+++ mk/defaults/mk.conf 12 Jan 2019 18:39:33 -0000
@@ -50,20 +50,29 @@
# Possible: -[0-9], --fast, --best (see gzip(1))
# Default: -9
-#MAKE_JOBS= 3
+#MAKE_JOBS= 3
+#MAKE_JOBS.category/dir= 2
# When defined, specifies the maximum number of jobs ("make -j")
# that are run in parallel when building packages with the default
# do-build action. MAKE_JOBS only affects the "build" target,
# neither "test" nor "install".
#
+# May be specified on a per-package basis; any package-specific
+# value overrides the global setting. Package-specific settings are
+# by source directory, not package name, as the circumstances that
+# would lead one to make them are based on properties of sources.
+#
# Possible values: any positive integer. Useful values are around
# the number of processors on the machine.
#
# Default value: (undefined)
#
-# Warning: This is experimental. Some packages will not build with
-# this. Disabling this for an individual package can be done by
+# Warning: Some packages will not build with this. Disabling
+# parallel builds for an individual package can be done by
# setting MAKE_JOBS_SAFE=NO within the per package Makefile.
+# When doing so, please include a comment indicating what went
+# wrong so it can be crosschecked in the future after upstream
+# changes.
#OBJHOSTNAME=
# use hostname-specific object directories, e.g. work.amnesiac, work.localhost
--
David A. Holland
dholland%netbsd.org@localhost
Home |
Main Index |
Thread Index |
Old Index