Hi there,
In attempt to catch (hopefully) last few remaining jobs-unsafe ports, and
thus to make upcoming expruns fallouts easier to handle, I'm sending small
patch I've been using locally for a while to get larger exposure. Patch
was sent to portmgr@ guys for review about a month earlier, it seems DTRT
at the first glances. :-)
FORCE_MAKE_JOBS is removed because it is the default. While here, I've
moved empty(MAKE_JOBS_NUMBER) check higher, IMHO where it should belong,
also saves a few lines. Testing and feedback are welcome! Let's finally
flip the damn switch! ;-)
./danfe
Index: bsd.port.mk
===================================================================
--- bsd.port.mk (revision 322093)
+++ bsd.port.mk (working copy)
@@ -912,9 +912,6 @@
# To be used with known bad ports.
# DISABLE_MAKE_JOBS
# - Set to disable the multiple jobs feature.
User settable.
-# FORCE_MAKE_JOBS
-# - Force all ports to be built with multiple
jobs, except ports
-# that are explicitly marked MAKE_JOBS_UNSAFE.
User settable.
# MAKE_JOBS_NUMBER
# - Override the number of make jobs to be used.
User settable.
## cacche
@@ -2167,20 +2164,15 @@
# Multiple make jobs support
.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
_MAKE_JOBS= #
+MAKE_JOBS_NUMBER?= 1
.else
-.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
MAKE_JOBS_NUMBER?= `${SYSCTL} -n kern.smp.cpus`
_MAKE_JOBS?= -j${MAKE_JOBS_NUMBER}
-.if defined(FORCE_MAKE_JOBS) && !defined(MAKE_JOBS_SAFE)
-BUILD_FAIL_MESSAGE+= "You have chosen to use multiple make jobs
(parallelization) for all ports. This port was not tested for this setting.
Please remove FORCE_MAKE_JOBS and retry the build before reporting the failure
to the maintainer."
+.if !defined(MAKE_JOBS_SAFE)
+BUILD_FAIL_MESSAGE+= "Try to set MAKE_JOBS_UNSAFE=yes and rebuild before
reporting the failure to the maintainer."
.endif
.endif
-.endif
-.if empty(MAKE_JOBS_NUMBER)
-MAKE_JOBS_NUMBER= 1
-.endif
-
# ccache support
# Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and
# don't use if ccache already set in CC
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
