From owner-freebsd-ports@FreeBSD.ORG Wed May 27 16:52:56 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 9C9C41065689; Wed, 27 May 2009 16:52:56 +0000 (UTC) (envelope-from naylor.b.david@gmail.com) Received: from mail-ew0-f212.google.com (mail-ew0-f212.google.com [209.85.219.212]) by mx1.freebsd.org (Postfix) with ESMTP id 99D908FC0A; Wed, 27 May 2009 16:52:55 +0000 (UTC) (envelope-from naylor.b.david@gmail.com) Received: by ewy8 with SMTP id 8so1071810ewy.43 for ; Wed, 27 May 2009 09:52:54 -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:message-id :content-type:content-transfer-encoding; bh=OKH6260sD8eRQ+5N3m8p1Za9KgYvoYEUa0JumgACZwI=; b=ReyZTBUGgITC6AH/BSO9aRq07i6/BhxsSpx94Tt9I2zINbR+HvtHOJWQiD/cw+stVC UUatmktJH07KsmmJ5LyfbkEg8ejthyEza6xlPzX1LZ5odXxNxB8oB27sBrLYmL0qsYYu eaGjfibFfB9+rbTXYCFZZgMLdAyVaeobqNg8c= 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:message-id:content-type :content-transfer-encoding; b=YjFjVHkt5b29dBhLQT03y2pCQYzlkWWI3ZO79D3QMoecZSahvfClbXP9ldb16Hy61F +3VLILr0jEt5NQ/C+jONsHSaGfYagw0MaOO7HlGgVDIIcZ/uR26hCzaF2fUY4PicAnNc F+8NsCDTzybaHxiuTY+t4oKZL8YHThBvwAhqg= Received: by 10.216.0.79 with SMTP id 57mr97473wea.48.1243443174012; Wed, 27 May 2009 09:52:54 -0700 (PDT) Received: from dragonmini.dg ([196.34.241.123]) by mx.google.com with ESMTPS id i6sm4690182gve.22.2009.05.27.09.52.51 (version=SSLv3 cipher=RC4-MD5); Wed, 27 May 2009 09:52:53 -0700 (PDT) From: David Naylor Organization: Private To: pav@freebsd.org Date: Wed, 27 May 2009 18:53:57 +0200 User-Agent: KMail/1.9.10 References: <200905251003.15408.naylor.b.david@gmail.com> <200905261817.30567.naylor.b.david@gmail.com> <1243372996.25437.0.camel@hood.oook.cz> In-Reply-To: <1243372996.25437.0.camel@hood.oook.cz> MIME-Version: 1.0 Message-Id: <200905271854.01190.naylor.b.david@gmail.com> Content-Type: multipart/signed; boundary="nextPart3079531.1Qe8J6isL3"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Cc: pgollucci@p6m7g8.com, itetcu@freebsd.org, 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: Wed, 27 May 2009 16:52:57 -0000 --nextPart3079531.1Qe8J6isL3 Content-Type: multipart/mixed; boundary="Boundary-01=_lAXHK6ESayxCIBU" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_lAXHK6ESayxCIBU Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Tuesday 26 May 2009 23:23:16 Pav Lucistnik wrote: > David Naylor p=C3=AD=C5=A1e v =C3=BAt 26. 05. 2009 v 18:17 +0200: > > What about the change that exposes MAKE_JOBS_NUMBER when MAKE_JOBS_SAFE > > or FORCE_MAKE_JOBS are defined (to avoid using ${_MAKE_JOBS:C/-j//}, not > > sure what the policy is of ports using *.mk internals). I think that is > > a reasonable change??? > > I think it's reasonable. It will need to be tested widely. Can you file > a PR with just that change, to help me track it while in testing? Done, please see PR ports/134977. This should not have any functional chan= ge=20 and the only ports (at this stage) that will use MAKE_JOBS_NUMBER is OOo*=20 (although games/teeworld is the next closest candidate). =20 I've also made some changes to how OOo2 handles concurrency, as pav@ pointe= d=20 out `make -j1` is different to `make` and OOo2 now differentiates between t= he=20 two, could someone please check if the following work: (cd /usr/ports/editors/openoffice.org-2; make MAKE_JOBS_NUMBER=3D1)=20 OOo3 should be functionally the same to the previous patch however it does = not=20 make the distinction between `make -j1` and `make` and I don't know enough= =20 about the build process to know how to add a normal `make`. =20 Thanks for all your patience. =20 David P.S. This should have been sent ~9 hours ago, but internet went down. P.P.S. This should be the final patch (pending OOo2 verification). --Boundary-01=_lAXHK6ESayxCIBU Content-Type: text/x-diff; charset="iso 8859-15"; name="openoffice3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="openoffice3.patch" diff -ur /usr/ports/Mk/bsd.port.mk ports/Mk/bsd.port.mk =2D-- /usr/ports/Mk/bsd.port.mk 2009-05-23 13:20:58.000000000 +0200 +++ ports/Mk/bsd.port.mk 2009-05-27 08:38:44.000000000 +0200 @@ -2185,11 +2185,8 @@ _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 .if defined(FORCE_MAKE_JOBS) 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 diff -ur /usr/ports/editors/openoffice.org-2/Makefile ports/editors/openoff= ice.org-2/Makefile =2D-- /usr/ports/editors/openoffice.org-2/Makefile 2009-01-25 10:45:45.0000= 00000 +0200 +++ ports/editors/openoffice.org-2/Makefile 2009-05-27 08:38:27.000000000 += 0200 @@ -51,6 +51,7 @@ USE_PERL5=3D yes USE_BZIP2=3D yes WITHOUT_CPU_CFLAGS=3D true +MAKE_JOBS_SAFE=3D yes =20 .include =20 @@ -132,7 +133,6 @@ CONFIGURE_WRKSRC=3D ${WRKSRC}/config_office TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DNUMOFPROCESSES?=3D 1 =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ @@ -192,8 +192,8 @@ do-build: @cd ${WRKSRC} ; ./bootstrap # PR:84786 #i53289# =2D.if (${NUMOFPROCESSES}>1) =2D @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${= =46REEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl = =2DP${NUMOFPROCESSES} --all" +.if !defined(DISABLE_MAKE_JOBS) + @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${FR= EEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${= MAKE_JOBS_NUMBER} --all" .else @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${FR= EEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif diff -ur /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-01-25 10:45:45.0= 00000000 +0200 +++ ports/editors/openoffice.org-2-RC/Makefile 2009-05-27 08:41:53.00000000= 0 +0200 @@ -52,6 +52,7 @@ USE_PERL5=3D yes USE_BZIP2=3D yes WITHOUT_CPU_CFLAGS=3D true +MAKE_JOBS_SAFE=3D yes =20 .include =20 @@ -134,7 +135,6 @@ CONFIGURE_WRKSRC=3D ${WRKSRC}/config_office TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DNUMOFPROCESSES?=3D 1 =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ @@ -194,8 +194,8 @@ do-build: @cd ${WRKSRC} ; ./bootstrap # PR:84786 #i53289# =2D.if (${NUMOFPROCESSES}>1) =2D @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${= =46REEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl = =2DP${NUMOFPROCESSES} --all" +.if !defined(DISABLE_MAKE_JOBS) + @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${FR= EEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${= MAKE_JOBS_NUMBER} --all" .else @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${FR= EEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif diff -ur /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-01-25 10:45:4= 5.000000000 +0200 +++ ports/editors/openoffice.org-2-devel/Makefile 2009-05-27 08:46:03.00000= 0000 +0200 @@ -52,6 +52,7 @@ USE_PERL5=3D yes USE_BZIP2=3D yes WITHOUT_CPU_CFLAGS=3D true +MAKE_JOBS_SAFE=3D yes =20 .include =20 @@ -137,8 +138,10 @@ CONFIGURE_WRKSRC=3D ${WRKSRC}/config_office TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER=3D 1 +.endif =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ @@ -200,7 +203,7 @@ =20 do-build: @cd ${WRKSRC} ; ./bootstrap =2D @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${= =46REEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl = =2D-checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -= =2D -P${MAXPROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" ${TCSH} -c "source ${FR= EEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --ch= eckmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -= =2D -P${MAKE_JOBS_NUMBER}" =20 .if ${LOCALIZED_LANG} =3D=3D "alllangs" @${MAKE} languagepack diff -ur /usr/ports/editors/openoffice.org-3/Makefile ports/editors/openoff= ice.org-3/Makefile =2D-- /usr/ports/editors/openoffice.org-3/Makefile 2009-05-21 20:14:02.0000= 00000 +0200 +++ ports/editors/openoffice.org-3/Makefile 2009-05-27 08:47:30.000000000 += 0200 @@ -50,6 +50,7 @@ USE_PERL5=3D yes USE_BZIP2=3D yes WITHOUT_CPU_CFLAGS=3D true +MAKE_JOBS_SAFE=3D yes =20 .include =20 @@ -134,8 +135,10 @@ WRKSRC?=3D ${WRKDIR}/${OOOTAG} TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER=3D 1 +.endif =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ @@ -201,7 +204,7 @@ =20 do-build: @cd ${WRKSRC} ; ./bootstrap =2D @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" "TMP=3D${WRKSRC}" ${T= CSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --check= modules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAX= PROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" "TMP=3D${WRKSRC}" ${TCS= H} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmo= dules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P$= {MAKE_JOBS_NUMBER}" =20 .if ${LOCALIZED_LANG} =3D=3D "alllangs" @${MAKE} languagepack diff -ur /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-21 20:14:06.0= 00000000 +0200 +++ ports/editors/openoffice.org-3-RC/Makefile 2009-05-27 08:49:14.00000000= 0 +0200 @@ -50,6 +50,7 @@ USE_PERL5=3D yes USE_BZIP2=3D yes WITHOUT_CPU_CFLAGS=3D true +MAKE_JOBS_SAFE=3D yes =20 .include =20 @@ -135,8 +136,10 @@ WRKSRC?=3D ${WRKDIR}/${OOOTAG} TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER=3D 1 +.endif =20 USE_AUTOTOOLS=3D autoconf:262 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ @@ -203,7 +206,7 @@ =20 do-build: @cd ${WRKSRC} ; ./bootstrap =2D @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" "TMP=3D${WRKSRC}" ${T= CSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --check= modules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAX= PROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" "TMP=3D${WRKSRC}" ${TCS= H} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmo= dules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P$= {MAKE_JOBS_NUMBER}" =20 .if ${LOCALIZED_LANG} =3D=3D "alllangs" @${MAKE} languagepack diff -ur /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-27 03:05:4= 7.000000000 +0200 +++ ports/editors/openoffice.org-3-devel/Makefile 2009-05-27 08:50:58.00000= 0000 +0200 @@ -48,6 +48,7 @@ USE_PERL5=3D yes USE_BZIP2=3D yes WITHOUT_CPU_CFLAGS=3D true +MAKE_JOBS_SAFE=3D yes =20 .include =20 @@ -134,8 +135,10 @@ WRKSRC?=3D ${WRKDIR}/${OOOTAG} TCSH?=3D /bin/tcsh PKGMESSAGE=3D ${WRKDIR}/pkg-message =2DMAXPROCESSES?=3D 1 =2DMAXMODULES?=3D 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER=3D 1 +.endif =20 CONFIGURE_ARGS+=3D --with-gnu-cp=3D${LOCALBASE}/bin/gcp \ --with-gnu-patch=3D${LOCALBASE}/bin/gpatch \ @@ -201,7 +204,7 @@ =20 do-build: @cd ${WRKSRC} ; ./bootstrap =2D @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" "TMP=3D${WRKSRC}" ${T= CSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --check= modules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAX= PROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=3DC" "LC_ALL=3DC" "TMP=3D${WRKSRC}" ${TCS= H} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmo= dules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P$= {MAKE_JOBS_NUMBER}" =20 .if ${LOCALIZED_LANG} =3D=3D "alllangs" @${MAKE} languagepack --Boundary-01=_lAXHK6ESayxCIBU-- --nextPart3079531.1Qe8J6isL3 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) iEYEABECAAYFAkodcCkACgkQUaaFgP9pFrIDKQCfW0lav+t5HlDquOOCK6XsXEnB rMIAnRqRDvzCH/GJnz/gNDRpBXLtqlCg =sCLT -----END PGP SIGNATURE----- --nextPart3079531.1Qe8J6isL3--