diff options
| author | wiz <wiz@pkgsrc.org> | 2011-08-04 23:52:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-08-04 23:52:04 +0000 |
| commit | 97fbb37c8dd6a131a2c79cebd0b81d5118d94e8f (patch) | |
| tree | b781930007d368c581d3c582e8ef6b1618574561 | |
| parent | 73d215bad64612c5d0a1b563a9f396e219d964ad (diff) | |
| download | pkgsrc-97fbb37c8dd6a131a2c79cebd0b81d5118d94e8f.tar.gz | |
Get rid of pkg-config build dependency.
| -rw-r--r-- | devel/glib2/Makefile | 5 | ||||
| -rw-r--r-- | devel/glib2/Makefile.common | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index b2ef1132c18..f66972d91b1 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.185 2011/06/02 18:08:46 reed Exp $ +# $NetBSD: Makefile,v 1.186 2011/08/04 23:52:04 wiz Exp $ .include "Makefile.common" @@ -34,6 +34,9 @@ CHECK_INTERPRETER_SKIP+= bin/gtester-report # need pcre utf8 + unicode-properties BUILDLINK_API_DEPENDS.pcre+= pcre>=8.11 +# to avoid pkg-config dependency, explicitly specify pcre location +CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include +CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre" # needs gz_header structure BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1 diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common index f3dccb3942d..2ccdd599dfb 100644 --- a/devel/glib2/Makefile.common +++ b/devel/glib2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2011/06/09 11:16:38 drochner Exp $ +# $NetBSD: Makefile.common,v 1.13 2011/08/04 23:52:04 wiz Exp $ # # used by devel/glib2/Makefile # used by sysutils/gio-fam/Makefile @@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake USE_LANGUAGES= c c++ c99 USE_LIBTOOL= yes TEST_TARGET= check |