Received: by mail.netbsd.org (Postfix, from userid 605)
	id BFD5084D4E; Sun, 19 Jan 2020 23:45:07 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 47D5C84D48
	for <pkgsrc-changes@NetBSD.org>; Sun, 19 Jan 2020 23:45:07 +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 oRLb-ykq9AzF for <pkgsrc-changes@netbsd.org>;
	Sun, 19 Jan 2020 23:45:06 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id C74B884C85
	for <pkgsrc-changes@NetBSD.org>; Sun, 19 Jan 2020 23:45:06 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id BAA3CFBF4; Sun, 19 Jan 2020 23:45:06 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_157947750685620"
MIME-Version: 1.0
Date: Sun, 19 Jan 2020 23:45:06 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
X-Mailer: log_accum
Message-Id: <20200119234506.BAA3CFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_157947750685620
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Sun Jan 19 23:45:06 UTC 2020

Modified Files:
	pkgsrc/mk: haskell.mk

Log Message:
Use _MAKE_JOBS_N defined in build/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_157947750685620
Content-Disposition: inline
Content-Length: 1663
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.13 pkgsrc/mk/haskell.mk:1.14
--- pkgsrc/mk/haskell.mk:1.13	Sat Jan 18 01:39:01 2020
+++ pkgsrc/mk/haskell.mk	Sun Jan 19 23:45:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.13 2020/01/18 01:39:01 pho Exp $
+# $NetBSD: haskell.mk,v 1.14 2020/01/19 23:45:06 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -207,17 +207,6 @@ CONFIGURE_ARGS+=	--with-haddock=${BUILDL
 # Optimization
 CONFIGURE_ARGS+=	-O${HASKELL_OPTIMIZATION_LEVEL}
 
-# Parallelization: the definition of this variable is exactly the same
-# as that of _MAKE_JOBS in mk/build/build.mk, but since it's an
-# internal variable we don't want to reuse it here.
-.if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
-_HASKELL_BUILD_JOBS=	# nothing
-.elif defined(MAKE_JOBS.${PKGPATH})
-_HASKELL_BUILD_JOBS=	-j${MAKE_JOBS.${PKGPATH}}
-.elif defined(MAKE_JOBS)
-_HASKELL_BUILD_JOBS=	-j${MAKE_JOBS}
-.endif
-
 # Starting from GHC 7.10 (or 7.8?), packages are installed in
 # directories with a hashed name so we can no longer predict the
 # contents of PLIST.
@@ -253,10 +242,10 @@ do-configure:
 		${SETENV} ${CONFIGURE_ENV} \
 			./Setup configure ${PKG_VERBOSE:D-v} ${CONFIGURE_ARGS}
 
-# Define build target.
+# Define build target. _MAKE_JOBS_N is defined in build/build.mk
 do-build:
 	${RUN}cd ${WRKSRC:Q} && \
-		./Setup build ${PKG_VERBOSE:D-v} ${_HASKELL_BUILD_JOBS}
+		./Setup build ${PKG_VERBOSE:D-v} -j${_MAKE_JOBS_N}
 .if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION} == "yes"
 	${RUN}cd ${WRKSRC:Q} && \
 		./Setup haddock ${PKG_VERBOSE:D-v}


--_----------=_157947750685620--