summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjmmv <jmmv>2008-04-20 19:32:31 +0000
committerjmmv <jmmv>2008-04-20 19:32:31 +0000
commitaa59db8792786487212f572c27539c8f741b2a44 (patch)
treea090a594583bc16b6d4b2283404b2d0470550844 /mk
parent41ac62878b13037566adbdff2547957d46811eb7 (diff)
downloadpkgsrc-aa59db8792786487212f572c27539c8f741b2a44.tar.gz
Reset PKG_CONFIG_PATH in the environment. Fixes misterious build problems
of packages when it is already defined by the user.
Diffstat (limited to 'mk')
-rw-r--r--mk/tools/pkg-config.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk
index 40d0cd8c835..b47ea6b187f 100644
--- a/mk/tools/pkg-config.mk
+++ b/mk/tools/pkg-config.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-config.mk,v 1.8 2007/03/05 23:35:59 rillig Exp $
+# $NetBSD: pkg-config.mk,v 1.9 2008/04/20 19:32:31 jmmv Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,14 +43,16 @@ _PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgco
_PKG_CONFIG_LOG?= ${WRKDIR}/.pkg-config.log
TOOLS_SCRIPT.pkg-config= \
- PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} ${TOOLS_SCRIPT_DFLT.pkg-config}
+ PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} PKG_CONFIG_PATH= ${TOOLS_SCRIPT_DFLT.pkg-config}
CONFIGURE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q}
CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q}
CONFIGURE_ENV+= PKG_CONFIG_LOG=${_PKG_CONFIG_LOG:Q}
+CONFIGURE_ENV+= PKG_CONFIG_PATH=
MAKE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q}
MAKE_ENV+= PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q}
MAKE_ENV+= PKG_CONFIG_LOG=${_PKG_CONFIG_LOG:Q}
+MAKE_ENV+= PKG_CONFIG_PATH=
.if defined(PKG_DEVELOPER)
post-build: pkgconfig-post-build