summaryrefslogtreecommitdiff
path: root/mk/tools
diff options
context:
space:
mode:
authorjperkin <jperkin>2015-06-19 15:22:44 +0000
committerjperkin <jperkin>2015-06-19 15:22:44 +0000
commit3a276402067b1fbdf0db3fb40c86fabae337cdde (patch)
tree1addf54cbd187091494594dde0a8e7fa70af9c9d /mk/tools
parentc1d94eb6cd6a79033200410d12d1a7887b368317 (diff)
downloadpkgsrc-3a276402067b1fbdf0db3fb40c86fabae337cdde.tar.gz
Don't use the platform /usr/bin/pkg-config. As per PR#49982 it causes
problems that are fixed by using the pkgsrc version, and no platform other than Cygwin tries to use a native version. Consensus is that due to the limited impact and clear benefit this is ok to go in during the freeze despite being an infrastructure change.
Diffstat (limited to 'mk/tools')
-rw-r--r--mk/tools/tools.SunOS.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 2e3d84d6096..a705f3372df 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.47 2015/02/01 08:48:56 obache Exp $
+# $NetBSD: tools.SunOS.mk,v 1.48 2015/06/19 15:22:44 jperkin Exp $
#
# System-supplied tools for the Solaris operating system.
#
@@ -164,9 +164,6 @@ TOOLS_PLATFORM.openssl?= /usr/bin/openssl
#TOOLS_PLATFORM.perl?= /usr/bin/perl
#TOOLS_PLATFORM.pod2man?= /usr/perl5/bin/pod2man
#.endif
-.if ${OS_VERSION} == "5.11" && exists(/usr/bin/pkg-config)
-TOOLS_PLATFORM.pkg-config?= /usr/bin/pkg-config
-.endif
TOOLS_PLATFORM.printf?= /bin/printf
TOOLS_PLATFORM.pwd?= /bin/pwd
.if exists(/usr/gnu/bin/readelf)