[pkgsrc/trunk]: pkgsrc Symlink any *.pc files into ${BUILDLINK_DIR} for depen...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e99fef930925
branches:  trunk
changeset: 468768:e99fef930925
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 16 21:01:17 2004 +0000

description:
Symlink any *.pc files into ${BUILDLINK_DIR} for dependencies and force
pkg-config to only look in ${BUILDLINK_DIR}/lib/pkgconfig for *.pc files.
This will correctly hide the presence of software from configure scripts
that query pkg-config for that information.

Idea suggested by Julio M. Merino Vidal.

diffstat:

 devel/pkgconfig/buildlink3.mk   |  12 ++++++------
 mk/buildlink3/bsd.buildlink3.mk |   4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r f69655763a17 -r e99fef930925 devel/pkgconfig/buildlink3.mk
--- a/devel/pkgconfig/buildlink3.mk     Mon Feb 16 20:59:26 2004 +0000
+++ b/devel/pkgconfig/buildlink3.mk     Mon Feb 16 21:01:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/14 21:54:12 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 21:01:17 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PKGCONFIG_BUILDLINK3_MK:=      ${PKGCONFIG_BUILDLINK3_MK}+
@@ -13,11 +13,11 @@
 BUILDLINK_PKGSRCDIR.pkgconfig?=        ../../devel/pkgconfig
 BUILDLINK_DEPMETHOD.pkgconfig?=        build
 
-PKG_CONFIG_PATH?=      ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
-CONFIGURE_ENV+=                PKG_CONFIG="${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config"
-CONFIGURE_ENV+=                PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-MAKE_ENV+=             PKG_CONFIG="${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config"
-MAKE_ENV+=             PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+PKG_CONFIG_LIBDIR?=    ${BUILDLINK_DIR}/lib/pkgconfig
+CONFIGURE_ENV+=                PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
+CONFIGURE_ENV+=                PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
+MAKE_ENV+=             PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
+MAKE_ENV+=             PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
 .endif # PKGCONFIG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r f69655763a17 -r e99fef930925 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Mon Feb 16 20:59:26 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Mon Feb 16 21:01:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.86 2004/02/16 03:08:52 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.87 2004/02/16 21:01:17 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -484,7 +484,7 @@
        ${GREP} 'lib.*/lib[^/]*\.la$$'
 .  else
 BUILDLINK_CONTENTS_FILTER.${_pkg_}?=                                   \
-       ${EGREP} '(include.*/|\.h$$|lib.*/lib[^/]*$$)'
+       ${EGREP} '(include.*/|\.h$$|\.pc$$|lib.*/lib[^/]*$$)'
 .  endif
 BUILDLINK_FILES_CMD.${_pkg_}?=                                         \
        ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |   \