From owner-freebsd-ports@FreeBSD.ORG Thu May 23 07:56:27 2013 Return-Path: Delivered-To: ports@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id A101776F; Thu, 23 May 2013 07:56:27 +0000 (UTC) Date: Thu, 23 May 2013 07:56:27 +0000 From: Alexey Dokuchaev To: Martin Wilke Subject: Re: Plans for making MAKE_JOBS_SAFE the default? Message-ID: <20130523075627.GA79696@FreeBSD.org> References: <50463F7F.2030502@shatow.net> <1A22DCEC-9548-4FD2-BFC5-4F3F4EC1E1C2@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="cWoXeonUoKmBZSoM" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Martin Wilke , Chris Rees , Olivier Smedts , FreeBSD Ports , Eitan Adler , Ports Management Team , Bryan Drewery 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: Thu, 23 May 2013 07:56:27 -0000 --cWoXeonUoKmBZSoM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, May 22, 2013 at 11:09:02AM +0800, Martin Wilke wrote: > Hi, > > Since we are back on normal rolling packages update for stable and I got > pointyhat-west up to do some testing, I would like to move on with this > case. > I just wonder if someone already has a patch to make it as default, else > I will have a look at it within this week. Howdy, I've cooked something up; only barely tested. Eventually BUILD_FAIL_MESSAGE can probably go away. 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. Reviews are welcome. ./danfe --cWoXeonUoKmBZSoM Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="bpm.diff" Index: bsd.port.mk =================================================================== --- bsd.port.mk (revision 318744) +++ bsd.port.mk (working copy) @@ -913,9 +913,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 @@ -2160,20 +2157,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 --cWoXeonUoKmBZSoM--