From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 4 16:40:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB08A1065673 for ; Thu, 4 Jun 2009 16:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B3AF18FC13 for ; Thu, 4 Jun 2009 16:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n54Ge1TM099227 for ; Thu, 4 Jun 2009 16:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n54Ge1Kn099226; Thu, 4 Jun 2009 16:40:01 GMT (envelope-from gnats) Resent-Date: Thu, 4 Jun 2009 16:40:01 GMT Resent-Message-Id: <200906041640.n54Ge1Kn099226@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Naylor Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21BF91065791 for ; Thu, 4 Jun 2009 16:32:25 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 09A148FC1C for ; Thu, 4 Jun 2009 16:32:25 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n54GWOIL089168 for ; Thu, 4 Jun 2009 16:32:24 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n54GWOS5089167; Thu, 4 Jun 2009 16:32:24 GMT (envelope-from nobody) Message-Id: <200906041632.n54GWOS5089167@www.freebsd.org> Date: Thu, 4 Jun 2009 16:32:24 GMT From: David Naylor To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/135262: [PATCH] Add MAKE_JOBS support for OpenOffice.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2009 16:40:02 -0000 >Number: 135262 >Category: ports >Synopsis: [PATCH] Add MAKE_JOBS support for OpenOffice.org >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 04 16:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: David Naylor >Release: n/a >Organization: Private >Environment: n/a >Description: editors/openoffice.org-* uses a custom do-build target (and a custom build script, perl I believe). Although the build script does support concurrency, and even the Makefiles have the capability to use it (if the Makefile is edited or some non-standard variables set) it is not using the newly introduced MAKE_JOBS in bsd.port.mk >How-To-Repeat: n/a >Fix: Apply attached patch, this marks the ports as SAFE and uses the variable MAKE_JOBS_NUMBER (instead of custom). Patch attached with submission follows: diff -ur /usr/ports/editors/openoffice.org-2/Makefile ports/editors/openoffice.org-2/Makefile --- /usr/ports/editors/openoffice.org-2/Makefile 2009-01-25 10:45:45.000000000 +0200 +++ ports/editors/openoffice.org-2/Makefile 2009-05-27 08:38:27.000000000 +0200 @@ -51,6 +51,7 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +MAKE_JOBS_SAFE= yes .include @@ -132,7 +133,6 @@ CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -NUMOFPROCESSES?= 1 CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ @@ -192,8 +192,8 @@ do-build: @cd ${WRKSRC} ; ./bootstrap # PR:84786 #i53289# -.if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" +.if !defined(DISABLE_MAKE_JOBS) + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${MAKE_JOBS_NUMBER} --all" .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif diff -ur /usr/ports/editors/openoffice.org-2-RC/Makefile ports/editors/openoffice.org-2-RC/Makefile --- /usr/ports/editors/openoffice.org-2-RC/Makefile 2009-01-25 10:45:45.000000000 +0200 +++ ports/editors/openoffice.org-2-RC/Makefile 2009-05-27 08:41:53.000000000 +0200 @@ -52,6 +52,7 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +MAKE_JOBS_SAFE= yes .include @@ -134,7 +135,6 @@ CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -NUMOFPROCESSES?= 1 CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ @@ -194,8 +194,8 @@ do-build: @cd ${WRKSRC} ; ./bootstrap # PR:84786 #i53289# -.if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all" +.if !defined(DISABLE_MAKE_JOBS) + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${MAKE_JOBS_NUMBER} --all" .else @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake" .endif diff -ur /usr/ports/editors/openoffice.org-2-devel/Makefile ports/editors/openoffice.org-2-devel/Makefile --- /usr/ports/editors/openoffice.org-2-devel/Makefile 2009-01-25 10:45:45.000000000 +0200 +++ ports/editors/openoffice.org-2-devel/Makefile 2009-05-27 08:46:03.000000000 +0200 @@ -52,6 +52,7 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +MAKE_JOBS_SAFE= yes .include @@ -137,8 +138,10 @@ CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -MAXPROCESSES?= 1 -MAXMODULES?= 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER= 1 +.endif CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ @@ -200,7 +203,7 @@ do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack diff -ur /usr/ports/editors/openoffice.org-3/Makefile ports/editors/openoffice.org-3/Makefile --- /usr/ports/editors/openoffice.org-3/Makefile 2009-05-21 20:14:02.000000000 +0200 +++ ports/editors/openoffice.org-3/Makefile 2009-05-27 08:47:30.000000000 +0200 @@ -50,6 +50,7 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +MAKE_JOBS_SAFE= yes .include @@ -134,8 +135,10 @@ WRKSRC?= ${WRKDIR}/${OOOTAG} TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -MAXPROCESSES?= 1 -MAXMODULES?= 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER= 1 +.endif CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ @@ -201,7 +204,7 @@ do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack diff -ur /usr/ports/editors/openoffice.org-3-RC/Makefile ports/editors/openoffice.org-3-RC/Makefile --- /usr/ports/editors/openoffice.org-3-RC/Makefile 2009-05-21 20:14:06.000000000 +0200 +++ ports/editors/openoffice.org-3-RC/Makefile 2009-05-27 08:49:14.000000000 +0200 @@ -50,6 +50,7 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +MAKE_JOBS_SAFE= yes .include @@ -135,8 +136,10 @@ WRKSRC?= ${WRKDIR}/${OOOTAG} TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -MAXPROCESSES?= 1 -MAXMODULES?= 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER= 1 +.endif USE_AUTOTOOLS= autoconf:262 CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ @@ -203,7 +206,7 @@ do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack diff -ur /usr/ports/editors/openoffice.org-3-devel/Makefile ports/editors/openoffice.org-3-devel/Makefile --- /usr/ports/editors/openoffice.org-3-devel/Makefile 2009-05-27 03:05:47.000000000 +0200 +++ ports/editors/openoffice.org-3-devel/Makefile 2009-05-27 08:50:58.000000000 +0200 @@ -48,6 +48,7 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +MAKE_JOBS_SAFE= yes .include @@ -134,8 +135,10 @@ WRKSRC?= ${WRKDIR}/${OOOTAG} TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message -MAXPROCESSES?= 1 -MAXMODULES?= 1 + +.if defined(DISABLE_MAKE_JOBS) +MAKE_JOBS_NUMBER= 1 +.endif CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ @@ -201,7 +204,7 @@ do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack >Release-Note: >Audit-Trail: >Unformatted: