Received: by mail.netbsd.org (Postfix, from userid 605) id 8025C84D25; Sat, 23 Jul 2022 07:14:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B1EB184CEE for ; Sat, 23 Jul 2022 07:14:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id O0bk9xw9Gt99 for ; Sat, 23 Jul 2022 07:14:55 +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 011A384CE2 for ; Sat, 23 Jul 2022 07:14:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E236FFB1A; Sat, 23 Jul 2022 07:14:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1658560494128860" MIME-Version: 1.0 Date: Sat, 23 Jul 2022 07:14:54 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220723071454.E236FFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1658560494128860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jul 23 07:14:54 UTC 2022 Modified Files: pkgsrc/mk: haskell.mk Log Message: mk/haskell.mk: remove pkg-config hiding workaround pkg-config is now hidden by default if not in USE_TOOLS To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 pkgsrc/mk/haskell.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1658560494128860 Content-Disposition: inline Content-Length: 1113 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.43 pkgsrc/mk/haskell.mk:1.44 --- pkgsrc/mk/haskell.mk:1.43 Sat Feb 26 03:55:37 2022 +++ pkgsrc/mk/haskell.mk Sat Jul 23 07:14:54 2022 @@ -1,4 +1,4 @@ -# $NetBSD: haskell.mk,v 1.43 2022/02/26 03:55:37 pho Exp $ +# $NetBSD: haskell.mk,v 1.44 2022/07/23 07:14:54 wiz Exp $ # # This Makefile fragment handles Haskell Cabal packages. Package # configuration, building, installation, registration and unregistration @@ -106,14 +106,6 @@ PKGNAME?= hs-${DISTNAME} MASTER_SITES?= ${MASTER_SITE_HASKELL_HACKAGE:=${DISTNAME}/} HOMEPAGE?= http://hackage.haskell.org/package/${DISTNAME:C/-[^-]*$//} -# Cabal packages may use pkg-config to find external libraries, but -# mk/tools/pkg-config.mk doesn't prevent it from being invoked when it's -# missing from USE_TOOLS for some reason. In our case that's very -# undesirable because we would be silently depending on it. -.if empty(USE_TOOLS:Mpkg-config) -TOOLS_FAIL+= pkg-config -.endif - # GHC can be a memory hog, so don't apply regular limits. UNLIMIT_RESOURCES+= datasize virtualsize --_----------=_1658560494128860--