diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2005-04-21 08:22:32 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2005-04-21 08:22:32 +0000 |
| commit | 11ccf6e38c718defbbbb6fae547d679d0f86ea0a (patch) | |
| tree | 7c5879494e06a20f76396ef3c29106fa16af3da7 | |
| parent | 461b34b21f936a4a10e41be9b2e2cc19aa51f5c0 (diff) | |
| download | pkgsrc-11ccf6e38c718defbbbb6fae547d679d0f86ea0a.tar.gz | |
As reported by Matthias Drochner, pkg-config tries to use always
PKG_CONFIG_PC_PATH even when PKG_CONFIG_PATH is defined, this is not
good for pkgsrc, apply suggested code by Johnny C. Lam to use
PKG_CONFIG_LIBDIR again.
Now our pkg-config does the following:
* If PKG_CONFIG_LIBDIR is set, use it.
* Otherwise PKG_CONFIG_PATH and default directories are used.
Bump PKGREVISION and sync the bl3 file again.
| -rw-r--r-- | devel/pkgconfig/Makefile | 4 | ||||
| -rw-r--r-- | devel/pkgconfig/buildlink3.mk | 8 | ||||
| -rw-r--r-- | devel/pkgconfig/distinfo | 3 | ||||
| -rw-r--r-- | devel/pkgconfig/patches/patch-aa | 25 |
4 files changed, 33 insertions, 7 deletions
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 310ac19ff78..ad06acce1f0 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2005/04/18 17:02:50 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2005/04/21 08:22:32 xtraeme Exp $ # DISTNAME= pkgconfig-0.17.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.freedesktop.org/software/pkgconfig/releases/ diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk index c318c691e9a..eec0d19766f 100644 --- a/devel/pkgconfig/buildlink3.mk +++ b/devel/pkgconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2005/03/30 22:31:30 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2005/04/21 08:22:32 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PKGCONFIG_BUILDLINK3_MK:= ${PKGCONFIG_BUILDLINK3_MK}+ @@ -15,11 +15,11 @@ BUILDLINK_DEPENDS.pkgconfig+= pkgconfig>=0.15.0 BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig BUILDLINK_DEPMETHOD.pkgconfig?= build -PKG_CONFIG_PATH?= ${BUILDLINK_DIR}/lib/pkgconfig +PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config -CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKG_CONFIG_PATH:Q} +CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} MAKE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config -MAKE_ENV+= PKG_CONFIG_PATH=${PKG_CONFIG_PATH:Q} +MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} .endif # PKGCONFIG_BUILDLINK3_MK diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index 6dcd4cf1cbb..95ba787ad2b 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.15 2005/04/17 20:23:36 hira Exp $ +$NetBSD: distinfo,v 1.16 2005/04/21 08:22:32 xtraeme Exp $ SHA1 (pkgconfig-0.17.2.tar.gz) = 93e32aa176fceb2f7fe4d4e938f599ade74edb09 RMD160 (pkgconfig-0.17.2.tar.gz) = ff6de406416abf9dcd5eaa77d1d8ef5e6bc6d935 Size (pkgconfig-0.17.2.tar.gz) = 965129 bytes +SHA1 (patch-aa) = 58592474033f44f244c639a29b89b73a9966b1a2 diff --git a/devel/pkgconfig/patches/patch-aa b/devel/pkgconfig/patches/patch-aa new file mode 100644 index 00000000000..5f25950e44a --- /dev/null +++ b/devel/pkgconfig/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.5 2005/04/21 08:22:32 xtraeme Exp $ + +--- main.c.orig 2005-04-21 10:11:45.000000000 +0200 ++++ main.c 2005-04-21 10:12:43.000000000 +0200 +@@ -278,13 +278,17 @@ + debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n"); + } + +- search_path = getenv ("PKG_CONFIG_PATH"); ++ search_path = getenv("PKG_CONFIG_LIBDIR"); ++ ++ if (search_path) ++ add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S); ++ else { ++ search_path = getenv("PKG_CONFIG_PATH"); + if (search_path) +- { + add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S); +- } + + add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S); ++ } + + #ifdef G_OS_WIN32 + { |