Received: by mail.netbsd.org (Postfix, from userid 605) id 702EE84D7A; Mon, 4 Jul 2022 04:37:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A5E8F84D2C for ; Mon, 4 Jul 2022 04:37:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 43g3iE8KIP1D for ; Mon, 4 Jul 2022 04:37:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EDDCE84CFE for ; Mon, 4 Jul 2022 04:37:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E1DBFFB1A; Mon, 4 Jul 2022 04:37:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1656909473231800" MIME-Version: 1.0 Date: Mon, 4 Jul 2022 04:37:53 +0000 From: "Paul Goyette" Subject: CVS commit: pkgsrc/misc/libreoffice To: pkgsrc-changes@NetBSD.org Reply-To: pgoyette@netbsd.org X-Mailer: log_accum Message-Id: <20220704043753.E1DBFFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1656909473231800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pgoyette Date: Mon Jul 4 04:37:53 UTC 2022 Modified Files: pkgsrc/misc/libreoffice: Makefile Log Message: Handle MAKE_JOBS.${PKGNAME} when dealing with the MAKE_JOBS_SAFE vs. --with-parallelism stuff "Looks fine" from wiz@ To generate a diff of this commit: cvs rdiff -u -r1.286 -r1.287 pkgsrc/misc/libreoffice/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1656909473231800 Content-Disposition: inline Content-Length: 853 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/libreoffice/Makefile diff -u pkgsrc/misc/libreoffice/Makefile:1.286 pkgsrc/misc/libreoffice/Makefile:1.287 --- pkgsrc/misc/libreoffice/Makefile:1.286 Thu Jun 30 11:18:38 2022 +++ pkgsrc/misc/libreoffice/Makefile Mon Jul 4 04:37:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.286 2022/06/30 11:18:38 nia Exp $ +# $NetBSD: Makefile,v 1.287 2022/07/04 04:37:53 pgoyette Exp $ VERREL= 7.3.3 VERRC= 2 @@ -188,7 +188,9 @@ CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp CONFIGURE_ENV+= ANT_LIB=${LOCALBASE}/lib/java/ant MAKE_JOBS_SAFE= no # --with-parallelism conficts with -jN -.if !empty(MAKE_JOBS) +.if !empty(MAKE_JOBS.${PKGPATH}) +CONFIGURE_ARGS+= --with-parallelism=${MAKE_JOBS.${PKGPATH}} +.elif !empty(MAKE_JOBS) CONFIGURE_ARGS+= --with-parallelism=${MAKE_JOBS} .else CONFIGURE_ARGS+= --with-parallelism=1 --_----------=_1656909473231800--