pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/haskell.mk: remove pkg-config hiding workaround



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c60c328ec7e7
branches:  trunk
changeset: 382212:c60c328ec7e7
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jul 23 07:14:54 2022 +0000

description:
mk/haskell.mk: remove pkg-config hiding workaround

pkg-config is now hidden by default if not in USE_TOOLS

diffstat:

 mk/haskell.mk |  10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diffs (24 lines):

diff -r 515129d89555 -r c60c328ec7e7 mk/haskell.mk
--- a/mk/haskell.mk     Sat Jul 23 06:55:29 2022 +0000
+++ b/mk/haskell.mk     Sat Jul 23 07:14:54 2022 +0000
@@ -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 @@
 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
 



Home | Main Index | Thread Index | Old Index