diff options
| author | recht <recht@pkgsrc.org> | 2004-02-15 09:58:15 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2004-02-15 09:58:15 +0000 |
| commit | ed64cea73c9c1801a66ef9680ae78357b7eb8ecf (patch) | |
| tree | 94065014926e5346da8b090bc1d9e8e23ca02caf /devel/pkgconfig | |
| parent | ad5d0b2e28a9d8c59f1a90e18637bdee88334184 (diff) | |
| download | pkgsrc-ed64cea73c9c1801a66ef9680ae78357b7eb8ecf.tar.gz | |
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 (limited to 'devel/pkgconfig')
| -rw-r--r-- | devel/pkgconfig/buildlink2.mk | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/devel/pkgconfig/buildlink2.mk b/devel/pkgconfig/buildlink2.mk index fe1dd6c3677..fa6c5850d6a 100644 --- a/devel/pkgconfig/buildlink2.mk +++ b/devel/pkgconfig/buildlink2.mk @@ -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 |