From owner-freebsd-ports@FreeBSD.ORG Sun Jun 30 16:38:42 2013 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6FA24F27 for ; Sun, 30 Jun 2013 16:38:42 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mx.nsu.ru (mx.nsu.ru [84.237.50.39]) by mx1.freebsd.org (Postfix) with ESMTP id 1D16C1370 for ; Sun, 30 Jun 2013 16:38:41 +0000 (UTC) Received: from regency.nsu.ru ([193.124.210.26]) by mx.nsu.ru with esmtp (Exim 4.69) (envelope-from ) id 1UtKdy-0007Aj-0h for ports@freebsd.org; Sun, 30 Jun 2013 23:38:30 +0700 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id r5UGeHgX059856 for ; Sun, 30 Jun 2013 23:40:17 +0700 (NOVT) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.14.2/8.14.2/Submit) id r5UGeBmb059813 for ports@freebsd.org; Sun, 30 Jun 2013 23:40:11 +0700 (NOVT) (envelope-from danfe) Date: Sun, 30 Jun 2013 23:40:11 +0700 From: Alexey Dokuchaev To: ports@freebsd.org Subject: CFT: [patch] making -jX builds the default Message-ID: <20130630164011.GA57563@regency.nsu.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="+QahgC5+KEYLbs62" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jun 2013 16:38:42 -0000 --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="makejobs.diff" 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 --+QahgC5+KEYLbs62--