diff options
| author | rillig <rillig> | 2007-02-23 02:49:56 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-02-23 02:49:56 +0000 |
| commit | d86b76a159c2685338ed5b7c3241a25fb94d8bb0 (patch) | |
| tree | dd395d2d9124f796ac269ebb713c9af9d42b16d8 /mk/tools | |
| parent | 9f0a62c64190b865d688348072b85499b8a3ca00 (diff) | |
| download | pkgsrc-d86b76a159c2685338ed5b7c3241a25fb94d8bb0.tar.gz | |
Too many packages fail in mysterious ways when they cannot find
pkg-config, which happens mostly after updating a package. Therefore, a
failing wrapper is installed for this tool.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/pkg-config.mk | 4 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk index 41a1718082a..37d48b5917a 100644 --- a/mk/tools/pkg-config.mk +++ b/mk/tools/pkg-config.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-config.mk,v 1.6 2006/08/06 09:35:39 jmmv Exp $ +# $NetBSD: pkg-config.mk,v 1.7 2007/02/23 02:49:56 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -42,8 +42,10 @@ _PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig _PKG_CONFIG_LOG?= ${WRKDIR}/.pkg-config.log +.if !empty(USE_TOOLS:C/\:.*//:Mpkg-config) TOOLS_SCRIPT.pkg-config= \ PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} ${TOOLS_SCRIPT_DFLT.pkg-config} +.endif CONFIGURE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q} CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 23719ed23e5..4656cf3ad36 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.184 2007/01/22 20:43:04 joerg Exp $ +# $NetBSD: replace.mk,v 1.185 2007/02/23 02:49:56 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -607,6 +607,8 @@ TOOLS_CREATE+= pkg-config TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pkg-config=pkg-config TOOLS_PATH.pkg-config= ${TOOLS_PREFIX.pkg-config}/bin/pkg-config . endif +.else +TOOLS_FAIL+= pkg-config .endif .if !defined(TOOLS_IGNORE.pod2man) && !empty(_USE_TOOLS:Mpod2man) |