From owner-freebsd-ports@FreeBSD.ORG Sat May 23 09:01:09 2009 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C46BB106564A; Sat, 23 May 2009 09:01:09 +0000 (UTC) (envelope-from naylor.b.david@gmail.com) Received: from mail-ew0-f159.google.com (mail-ew0-f159.google.com [209.85.219.159]) by mx1.freebsd.org (Postfix) with ESMTP id 15E248FC08; Sat, 23 May 2009 09:01:08 +0000 (UTC) (envelope-from naylor.b.david@gmail.com) Received: by ewy3 with SMTP id 3so2339204ewy.43 for ; Sat, 23 May 2009 02:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:organization:to:subject :date:user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=a9TcxhDcG3zcKCbvSCDtskiKWYz8nmnDgEljVgryhBc=; b=Bc99ejavxg9zln0ZkwWdnBPkprlAKBsOV3pmTrHLfveL0SAwuIpI58TU4k46PepTQH u+OlZPqDy2rNJizMDtmC58KEfsG+37lqrV1/0vxV0um9tToRL2a4FFG779tjqWD7vy5U xyTPki5U2tDwxPhELGJ7QwNRpJjlqATSGlGVQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:organization:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; b=Xy+tFqfrQp5PLqgXPqQ4jvvHFZ+c/dO3jLefuZJb5HH/sOGAOQokzeYlB5v/5euRbU j6djOmiAAijkR/MLg7gr/3mOtoc64JUi/DWlms1Y/N9h2w9dCuTmN0ZDRXsBCQSbqylD InMEZXoQIijIm8wdYmyXfxIPC8owXampUklas= Received: by 10.210.135.20 with SMTP id i20mr2045575ebd.17.1243069267934; Sat, 23 May 2009 02:01:07 -0700 (PDT) Received: from ?0.0.0.0? ([196.34.241.123]) by mx.google.com with ESMTPS id 28sm3536398eyg.34.2009.05.23.02.01.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 23 May 2009 02:01:07 -0700 (PDT) From: David Naylor Organization: Private To: "Ion-Mihai Tetcu" Date: Sat, 23 May 2009 11:01:56 +0200 User-Agent: KMail/1.9.10 References: <20090522080342.3b8d3c6b@it.buh.tecnik93.com> <20090522.195350.193746535.chat95@mac.com> <20090522164138.236cb114@it.buh.tecnik93.com> In-Reply-To: <20090522164138.236cb114@it.buh.tecnik93.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1500873.xBHcdVjtsE"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200905231101.59467.naylor.b.david@gmail.com> Cc: "Philip M. Gollucci" , freebsd-ports@freebsd.org Subject: Re: MAKE_JOBS_UNSAFE (some more ports) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2009 09:01:10 -0000 --nextPart1500873.xBHcdVjtsE Content-Type: multipart/mixed; boundary="Boundary-01=_Eu7FKDMm1dWoo/l" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_Eu7FKDMm1dWoo/l Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 22 May 2009 15:41:38 Ion-Mihai Tetcu wrote: > On Fri, 22 May 2009 19:53:50 +0900 (JST) > > Maho NAKATA wrote: > > In massive parallel build, OOo can be broken. We explicitly > > fix them otherwise broken. I just test with MAXJOB =3D 4 or something > > like that. > > > > > I had it complain about perl (or > > > something) needing to be recompiled but that was because I > > > interrupted the build process. It has always completed for me when > > > using MAX* from the start. > > > > me too. but - note it just works for you. > > > > > I can make the patch, only thing is bsd.port.mk will need to be > > > patched (simple enough though). > > I can run a few test builds on QAT and maybe Phillip can do the same on > his tindy. Just drop us the patch ;-) > Even if it only works with MAXJOB =3D 2, we mark it as such and the build > will be faster. Please see attached for the patch. The changes to bsd.port.mk: =2D MAKE_JOBS_NUMBER always defined =2D MAKE_JOBS_NUMBER forced to 1 if UNSAFE of DISABLE =2D MAKE_JOBS_NUMBER defaults (but user defined) to number of cores I've then used MAKE_JOBS_NUMBER to set MAXPROCESSES, MAXMODULES and=20 NUMOFPROCESSES for openoffice-* (not including 1.*). =20 I believe openoffice-2* can me marked as SAFE while openoffice-3* should no= t=20 be marked at all (since it sometimes works..., very well for me :-). =20 This patch just makes openoffice-* behave like other ports in regards to=20 parallel builds and the usual MAKE_JOBS variables now works as expected. =20 Happy testing, David --Boundary-01=_Eu7FKDMm1dWoo/l Content-Type: text/x-diff; charset="iso 8859-15"; name="openoffice.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="openoffice.patch" diff -ru /usr/ports/Mk/bsd.port.mk ports/Mk/bsd.port.mk =2D-- /usr/ports/Mk/bsd.port.mk 2009-05-23 10:54:23.000000000 +0200 +++ ports/Mk/bsd.port.mk 2009-05-23 10:55:11.000000000 +0200 @@ -2178,15 +2178,13 @@ =20 # Multiple make jobs support .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE) +MAKE_JOBS_NUMBER=3D 1 _MAKE_JOBS=3D # .else .if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) =2D.if defined(MAKE_JOBS_NUMBER) +MAKE_JOBS_NUMBER?=3D `${SYSCTL} -n kern.smp.cpus` _MAKE_JOBS=3D -j${MAKE_JOBS_NUMBER} =2D.else =2D_MAKE_JOBS=3D -j`${SYSCTL} -n kern.smp.cpus` =2D.endif =2D.if defined(FORCE_MAKE_JOBS) +.if defined(FORCE_MAKE_JOBS) && !defined(MAKE_JOBS_SAFE) BUILD_FAIL_MESSAGE+=3D "You have chosen to use multiple make jobs (paralle= lization) for all ports. This port was not tested for this setting. Pleas= e remove FORCE_MAKE_JOBS and retry the build before reporting the failure t= o the maintainer." .endif .endif diff -ru /usr/ports/editors/openoffice.org-2/Makefile ports/editors/openoff= ice.org-2/Makefile =2D-- /usr/ports/editors/openoffice.org-2/Makefile 2009-05-23 10:54:23.0000= 00000 +0200 +++ ports/editors/openoffice.org-2/Makefile 2009-05-23 10:34:17.000000000 += 0200 @@ -132,7 +132,7 @@ CONFIGURE_WRKSRC=3D ${WRKSRC}/config_office TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DNUMOFPROCESSES?=3D 1 +NUMOFPROCESSES?=3D ${MAKE_JOBS_NUMBER} =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ diff -ru /usr/ports/editors/openoffice.org-2-RC/Makefile ports/editors/open= office.org-2-RC/Makefile =2D-- /usr/ports/editors/openoffice.org-2-RC/Makefile 2009-05-23 10:54:23.0= 00000000 +0200 +++ ports/editors/openoffice.org-2-RC/Makefile 2009-05-23 10:35:49.00000000= 0 +0200 @@ -134,7 +134,7 @@ CONFIGURE_WRKSRC=3D ${WRKSRC}/config_office TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DNUMOFPROCESSES?=3D 1 +NUMOFPROCESSES?=3D ${MAKE_JOBS_NUMBER} =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ diff -ru /usr/ports/editors/openoffice.org-2-devel/Makefile ports/editors/o= penoffice.org-2-devel/Makefile =2D-- /usr/ports/editors/openoffice.org-2-devel/Makefile 2009-05-23 10:54:2= 3.000000000 +0200 +++ ports/editors/openoffice.org-2-devel/Makefile 2009-05-23 10:36:11.00000= 0000 +0200 @@ -137,8 +137,8 @@ CONFIGURE_WRKSRC=3D ${WRKSRC}/config_office TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 +MAXPROCESSES?=3D ${MAKE_JOBS_NUMBER} +MAXMODULES?=3D ${MAKE_JOBS_NUMBER} =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ diff -ru /usr/ports/editors/openoffice.org-3/Makefile ports/editors/openoff= ice.org-3/Makefile =2D-- /usr/ports/editors/openoffice.org-3/Makefile 2009-05-23 10:54:23.0000= 00000 +0200 +++ ports/editors/openoffice.org-3/Makefile 2009-05-23 10:36:29.000000000 += 0200 @@ -134,8 +134,8 @@ WRKSRC?=3D ${WRKDIR}/${OOOTAG} TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 +MAXPROCESSES?=3D ${MAKE_JOBS_NUMBER} +MAXMODULES?=3D ${MAKE_JOBS_NUMBER} =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ diff -ru /usr/ports/editors/openoffice.org-3-RC/Makefile ports/editors/open= office.org-3-RC/Makefile =2D-- /usr/ports/editors/openoffice.org-3-RC/Makefile 2009-05-23 10:54:23.0= 00000000 +0200 +++ ports/editors/openoffice.org-3-RC/Makefile 2009-05-23 10:36:59.00000000= 0 +0200 @@ -135,8 +135,8 @@ WRKSRC?=3D ${WRKDIR}/${OOOTAG} TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 +MAXPROCESSES?=3D ${MAKE_JOBS_NUMBER} +MAXMODULES?=3D ${MAKE_JOBS_NUMBER} =20 USE_AUTOTOOLS=3D autoconf:262 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ diff -ru /usr/ports/editors/openoffice.org-3-devel/Makefile ports/editors/o= penoffice.org-3-devel/Makefile =2D-- /usr/ports/editors/openoffice.org-3-devel/Makefile 2009-05-23 10:54:2= 3.000000000 +0200 +++ ports/editors/openoffice.org-3-devel/Makefile 2009-05-23 10:36:42.00000= 0000 +0200 @@ -133,8 +133,8 @@ WRKSRC?=3D ${WRKDIR}/${OOOTAG} TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 +MAXPROCESSES?=3D ${MAKE_JOBS_NUMBER} +MAXMODULES?=3D ${MAKE_JOBS_NUMBER} =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ --Boundary-01=_Eu7FKDMm1dWoo/l-- --nextPart1500873.xBHcdVjtsE Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) iEYEABECAAYFAkoXu4cACgkQUaaFgP9pFrLguACaAiDgvK1yuM4Gnrvo4w/oK6Hy yR4An2PjN2mumj5oApel6OZlX+jl3GZV =MSBJ -----END PGP SIGNATURE----- --nextPart1500873.xBHcdVjtsE--