From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 20 09:30:21 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C23A216A4CE for ; Wed, 20 Apr 2005 09:30:21 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A65F43D41 for ; Wed, 20 Apr 2005 09:30:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3K9ULnr047248 for ; Wed, 20 Apr 2005 09:30:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3K9UL5o047238; Wed, 20 Apr 2005 09:30:21 GMT (envelope-from gnats) Resent-Date: Wed, 20 Apr 2005 09:30:21 GMT Resent-Message-Id: <200504200930.j3K9UL5o047238@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, Michael Johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAEDE16A4CE for ; Wed, 20 Apr 2005 09:23:27 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4EAB43D2F for ; Wed, 20 Apr 2005 09:23:27 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j3K9NRiD059354 for ; Wed, 20 Apr 2005 09:23:27 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j3K9NRPl059353; Wed, 20 Apr 2005 09:23:27 GMT (envelope-from nobody) Message-Id: <200504200923.j3K9NRPl059353@www.freebsd.org> Date: Wed, 20 Apr 2005 09:23:27 GMT From: Michael Johnson To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/80132: [PATCH] bsd.port.mk -- Add support for -j (make jobs) in do-build: X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 09:30:22 -0000 >Number: 80132 >Category: ports >Synopsis: [PATCH] bsd.port.mk -- Add support for -j (make jobs) in do-build: >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: Wed Apr 20 09:30:21 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Michael Johnson >Release: >Organization: >Environment: >Description: This patch adds -j (make jobs) support in do-build: with the user defined knob of MAKE_JOBS (ie. MAKE_JOBS=4, would set -j4) , also ports can use MAX_JOBS (ie. MAX_JOBS=1, would set -j1 if MAX_JOBS < MAKE_JOBS) or NOMAKEJOBS and this would make MAKEJOBS empty. This patch greatly improves compile time speeds esp. if used with distcc. >How-To-Repeat: >Fix: Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.511 diff -u -r1.511 bsd.port.mk --- bsd.port.mk 17 Mar 2005 23:22:07 -0000 1.511 +++ bsd.port.mk 20 Apr 2005 09:21:27 -0000 @@ -1412,6 +1412,21 @@ .endif .endif +.if defined(MAKE_JOBS) +.if defined(MAX_JOBS) && ${MAX_JOBS} < ${MAKE_JOBS} +MAKEJOBS= -j${MAX_JOBS} +.else +.if defined(MAKE_JOBS) +MAKEJOBS= -j${MAKE_JOBS} +.endif +.if defined(NOMAKEJOBS) +MAKEJOBS= # empty +.endif +.else +MAKEJOBS= # empty +.endif +.endif + .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) MANCOMPRESSED?= yes .else @@ -3300,12 +3315,12 @@ .if !target(do-build) do-build: .if defined(USE_GMAKE) - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKEJOBS} ${MAKE_ARGS} ${ALL_TARGET}) .else .if defined(PERL_MODBUILD) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET}) .else - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKEJOBS} ${MAKE_ARGS} ${ALL_TARGET}) .endif .endif .endif >Release-Note: >Audit-Trail: >Unformatted: