pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/pkgconfig Fix build of pkgconfig dependent packa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/07ea243e20a1
branches:  trunk
changeset: 468588:07ea243e20a1
user:      recht <recht%pkgsrc.org@localhost>
date:      Sun Feb 15 09:58:15 2004 +0000

description:
Fix build of pkgconfig dependent packages by adding the PREFIX* definitions
and using them to set up the CONFIGURE_ENV.
Fixes at least xcursor in buildlink2 mode.

diffstat:

 devel/pkgconfig/buildlink2.mk |  21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 79fab20ad48e -r 07ea243e20a1 devel/pkgconfig/buildlink2.mk
--- a/devel/pkgconfig/buildlink2.mk     Sun Feb 15 09:52:35 2004 +0000
+++ b/devel/pkgconfig/buildlink2.mk     Sun Feb 15 09:58:15 2004 +0000
@@ -1,17 +1,24 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/14 21:54:12 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/02/15 09:58:15 recht Exp $
 
 .if !defined(PKGCONFIG_BUILDLINK2_MK)
 PKGCONFIG_BUILDLINK2_MK=       # defined
 
-BUILDLINK_PACKAGES+=           pkgconfig
-BUILDLINK_DEPENDS.pkgconfig?=  pkgconfig>=0.15.0
-BUILDLINK_PKGSRCDIR.pkgconfig?=        ../../devel/pkgconfig
-BUILDLINK_DEPMETHOD.pkgconfig?=        build
+BUILDLINK_PACKAGES+=                   pkgconfig
+BUILDLINK_DEPENDS.pkgconfig?=          pkgconfig>=0.15.0
+BUILDLINK_PKGSRCDIR.pkgconfig?=                ../../devel/pkgconfig
+BUILDLINK_DEPMETHOD.pkgconfig?=                build
+
+EVAL_PREFIX+=  BUILDLINK_PREFIX.pkgconfig=pkgconfig
+BUILDLINK_PREFIX.pkgconfig_DEFAULT=    ${LOCALBASE}
+
+BUILDLINK_TARGETS+=    pkgconfig-buildlink
+
+pkgconfig-buildlink: _BUILDLINK_USE
 
 PKG_CONFIG_PATH?=      ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
-CONFIGURE_ENV+=                PKG_CONFIG="${BUILDLINK_DEPENDS.pkgconfig}/bin/pkg-config"
+CONFIGURE_ENV+=                PKG_CONFIG="${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config"
 CONFIGURE_ENV+=                PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-MAKE_ENV+=             PKG_CONFIG="${BUILDLINK_DEPENDS.pkgconfig}/bin/pkg-config"
+MAKE_ENV+=             PKG_CONFIG="${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config"
 MAKE_ENV+=             PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
 
 .endif # PKGCONFIG_BUILDLINK2_MK



Home | Main Index | Thread Index | Old Index