CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

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.

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